You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by lu...@apache.org on 2023/12/18 21:18:50 UTC
(incubator-kie-optaplanner) branch main updated: Optaplanner 9 is on main branch, Jakarta namespace as default (#3051)
This is an automated email from the ASF dual-hosted git repository.
lucamolteni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-optaplanner.git
The following commit(s) were added to refs/heads/main by this push:
new 63a447de42 Optaplanner 9 is on main branch, Jakarta namespace as default (#3051)
63a447de42 is described below
commit 63a447de42cbb1bfe2d4545f2a786caac26547b9
Author: Luca Molteni <vo...@gmail.com>
AuthorDate: Mon Dec 18 22:18:45 2023 +0100
Optaplanner 9 is on main branch, Jakarta namespace as default (#3051)
* Migrate to OptaPlanner 9
* Upgrade Quarkus to LTS 3.2.9
* Remove Java 11 from GH Actions
---
.github/workflows/pull_request.yml | 2 +-
build/optaplanner-bom/pom.xml | 2 +-
build/optaplanner-build-parent/pom.xml | 16 +-
build/optaplanner-distribution-internal/pom.xml | 2 +-
build/optaplanner-ide-config/pom.xml | 2 +-
build/optaplanner-javadoc/pom.xml | 6 +-
core/optaplanner-constraint-drl/pom.xml | 2 +-
core/optaplanner-constraint-streams-bavet/pom.xml | 2 +-
core/optaplanner-constraint-streams-common/pom.xml | 2 +-
core/optaplanner-constraint-streams-drools/pom.xml | 2 +-
core/optaplanner-core-impl/pom.xml | 5 +-
.../core/api/domain/common/package-info.java | 4 +-
.../core/api/score/stream/package-info.java | 2 +-
.../optaplanner/core/config/AbstractConfig.java | 4 +-
.../ConstructionHeuristicPhaseConfig.java | 6 +-
.../ConstructionHeuristicType.java | 2 +-
.../ConstructionHeuristicForagerConfig.java | 2 +-
.../ConstructionHeuristicPickEarlyType.java | 2 +-
.../decider/forager/package-info.java | 4 +-
.../config/constructionheuristic/package-info.java | 4 +-
.../placer/EntityPlacerConfig.java | 2 +-
.../placer/PooledEntityPlacerConfig.java | 6 +-
.../placer/QueuedEntityPlacerConfig.java | 6 +-
.../placer/QueuedValuePlacerConfig.java | 6 +-
.../constructionheuristic/placer/package-info.java | 4 +-
.../ExhaustiveSearchPhaseConfig.java | 6 +-
.../exhaustivesearch/ExhaustiveSearchType.java | 2 +-
.../exhaustivesearch/NodeExplorationType.java | 2 +-
.../core/config/exhaustivesearch/package-info.java | 4 +-
.../selector/common/SelectionCacheType.java | 2 +-
.../heuristic/selector/common/SelectionOrder.java | 2 +-
.../common/decorator/SelectionSorterOrder.java | 2 +-
.../selector/common/decorator/package-info.java | 4 +-
.../common/nearby/NearbySelectionConfig.java | 4 +-
.../nearby/NearbySelectionDistributionType.java | 2 +-
.../selector/common/nearby/package-info.java | 4 +-
.../heuristic/selector/common/package-info.java | 4 +-
.../selector/entity/EntitySelectorConfig.java | 6 +-
.../selector/entity/EntitySorterManner.java | 2 +-
.../heuristic/selector/entity/package-info.java | 4 +-
.../entity/pillar/PillarSelectorConfig.java | 4 +-
.../entity/pillar/SubPillarConfigPolicy.java | 2 +-
.../selector/entity/pillar/package-info.java | 4 +-
.../selector/list/DestinationSelectorConfig.java | 4 +-
.../selector/list/SubListSelectorConfig.java | 6 +-
.../heuristic/selector/list/package-info.java | 4 +-
.../selector/move/MoveSelectorConfig.java | 4 +-
.../CartesianProductMoveSelectorConfig.java | 6 +-
.../move/composite/UnionMoveSelectorConfig.java | 6 +-
.../selector/move/composite/package-info.java | 4 +-
.../move/factory/MoveIteratorFactoryConfig.java | 4 +-
.../move/factory/MoveListFactoryConfig.java | 4 +-
.../selector/move/factory/package-info.java | 4 +-
.../generic/AbstractPillarMoveSelectorConfig.java | 4 +-
.../move/generic/ChangeMoveSelectorConfig.java | 4 +-
.../generic/PillarChangeMoveSelectorConfig.java | 4 +-
.../move/generic/PillarSwapMoveSelectorConfig.java | 6 +-
.../selector/move/generic/SubPillarType.java | 2 +-
.../move/generic/SwapMoveSelectorConfig.java | 6 +-
.../generic/chained/KOptMoveSelectorConfig.java | 4 +-
.../chained/SubChainChangeMoveSelectorConfig.java | 4 +-
.../chained/SubChainSwapMoveSelectorConfig.java | 4 +-
.../chained/TailChainSwapMoveSelectorConfig.java | 4 +-
.../move/generic/chained/package-info.java | 4 +-
.../generic/list/ListChangeMoveSelectorConfig.java | 4 +-
.../generic/list/ListSwapMoveSelectorConfig.java | 4 +-
.../list/SubListChangeMoveSelectorConfig.java | 4 +-
.../list/SubListSwapMoveSelectorConfig.java | 4 +-
.../list/kopt/KOptListMoveSelectorConfig.java | 4 +-
.../move/generic/list/kopt/package-info.java | 4 +-
.../selector/move/generic/list/package-info.java | 4 +-
.../selector/move/generic/package-info.java | 4 +-
.../heuristic/selector/move/package-info.java | 4 +-
.../config/heuristic/selector/package-info.java | 4 +-
.../selector/value/ValueSelectorConfig.java | 6 +-
.../selector/value/ValueSorterManner.java | 2 +-
.../value/chained/SubChainSelectorConfig.java | 4 +-
.../selector/value/chained/package-info.java | 4 +-
.../heuristic/selector/value/package-info.java | 4 +-
.../config/localsearch/LocalSearchPhaseConfig.java | 6 +-
.../core/config/localsearch/LocalSearchType.java | 2 +-
.../localsearch/decider/acceptor/AcceptorType.java | 2 +-
.../acceptor/LocalSearchAcceptorConfig.java | 4 +-
.../localsearch/decider/acceptor/package-info.java | 4 +-
.../StepCountingHillClimbingType.java | 2 +-
.../stepcountinghillclimbing/package-info.java | 4 +-
.../decider/forager/FinalistPodiumType.java | 2 +-
.../decider/forager/LocalSearchForagerConfig.java | 2 +-
.../decider/forager/LocalSearchPickEarlyType.java | 2 +-
.../localsearch/decider/forager/package-info.java | 4 +-
.../core/config/localsearch/package-info.java | 4 +-
.../org/optaplanner/core/config/package-info.java | 4 +-
.../PartitionedSearchPhaseConfig.java | 8 +-
.../config/partitionedsearch/package-info.java | 4 +-
.../optaplanner/core/config/phase/PhaseConfig.java | 6 +-
.../config/phase/custom/CustomPhaseConfig.java | 8 +-
.../core/config/phase/custom/package-info.java | 4 +-
.../core/config/phase/package-info.java | 4 +-
.../score/definition/ScoreDefinitionType.java | 2 +-
.../core/config/score/definition/package-info.java | 4 +-
.../score/director/ScoreDirectorFactoryConfig.java | 8 +-
.../core/config/score/director/package-info.java | 4 +-
.../score/trend/InitializingScoreTrendLevel.java | 2 +-
.../core/config/score/trend/package-info.java | 4 +-
.../core/config/solver/EnvironmentMode.java | 2 +-
.../core/config/solver/SolverConfig.java | 10 +-
.../core/config/solver/SolverManagerConfig.java | 2 +-
.../config/solver/monitoring/MonitoringConfig.java | 4 +-
.../config/solver/monitoring/SolverMetric.java | 2 +-
.../config/solver/monitoring/package-info.java | 4 +-
.../core/config/solver/package-info.java | 4 +-
.../core/config/solver/random/RandomType.java | 2 +-
.../core/config/solver/random/package-info.java | 4 +-
.../termination/TerminationCompositionStyle.java | 2 +-
.../solver/termination/TerminationConfig.java | 8 +-
.../config/solver/termination/package-info.java | 4 +-
.../core/impl/io/jaxb/GenericJaxbIO.java | 11 +-
.../jaxb/adapter/JaxbCustomPropertiesAdapter.java | 8 +-
.../impl/io/jaxb/adapter/JaxbDurationAdapter.java | 2 +-
.../impl/io/jaxb/adapter/JaxbLocaleAdapter.java | 2 +-
.../io/jaxb/adapter/JaxbOffsetDateTimeAdapter.java | 2 +-
.../core/impl/io/jaxb/GenericJaxbIOTest.java | 6 +-
.../adapter/JaxbCustomPropertiesAdapterTest.java | 14 +-
core/optaplanner-core/pom.xml | 2 +-
core/pom.xml | 2 +-
optaplanner-benchmark/pom.xml | 5 +-
.../benchmark/config/PlannerBenchmarkConfig.java | 12 +-
.../benchmark/config/ProblemBenchmarksConfig.java | 4 +-
.../benchmark/config/SolverBenchmarkConfig.java | 4 +-
.../blueprint/SolverBenchmarkBluePrintConfig.java | 2 +-
.../blueprint/SolverBenchmarkBluePrintType.java | 2 +-
.../benchmark/config/blueprint/package-info.java | 4 +-
.../optaplanner/benchmark/config/package-info.java | 6 +-
.../config/ranking/SolverRankingType.java | 2 +-
.../benchmark/config/ranking/package-info.java | 4 +-
.../config/report/BenchmarkReportConfig.java | 4 +-
.../benchmark/config/report/package-info.java | 4 +-
.../config/statistic/ProblemStatisticType.java | 2 +-
.../config/statistic/SingleStatisticType.java | 2 +-
.../benchmark/config/statistic/package-info.java | 4 +-
.../benchmark/impl/loader/FileProblemProvider.java | 2 +-
.../impl/loader/InstanceProblemProvider.java | 2 +-
.../benchmark/impl/loader/ProblemProvider.java | 2 +-
.../impl/result/PlannerBenchmarkResult.java | 6 +-
.../impl/result/ProblemBenchmarkResult.java | 8 +-
.../impl/result/SingleBenchmarkResult.java | 8 +-
.../impl/result/SolverBenchmarkResult.java | 4 +-
.../impl/result/SubSingleBenchmarkResult.java | 6 +-
.../benchmark/impl/result/package-info.java | 8 +-
.../benchmark/impl/statistic/ProblemStatistic.java | 8 +-
.../impl/statistic/PureSubSingleStatistic.java | 2 +-
.../impl/statistic/SubSingleStatistic.java | 6 +-
...raintMatchTotalBestScoreSubSingleStatistic.java | 2 +-
...raintMatchTotalStepScoreSubSingleStatistic.java | 2 +-
...kedMoveTypeBestScoreDiffSubSingleStatistic.java | 2 +-
...kedMoveTypeStepScoreDiffSubSingleStatistic.java | 2 +-
.../statistic/AbstractSubSingleStatisticTest.java | 11 +-
optaplanner-docs/pom.xml | 2 +-
optaplanner-examples/pom.xml | 6 +-
.../ConferenceSchedulingCfpDevoxxImporter.java | 10 +-
optaplanner-migration/pom.xml | 2 +-
optaplanner-operator/pom.xml | 4 +-
.../impl/solver/OptaPlannerSolverReconciler.java | 2 +-
.../solver/OptaPlannerSolverReconcilerTest.java | 4 +-
.../optaplanner-persistence-common/pom.xml | 2 +-
.../optaplanner-persistence-jackson/pom.xml | 2 +-
.../optaplanner-persistence-jaxb/pom.xml | 6 +-
.../jaxb/api/score/AbstractScoreJaxbAdapter.java | 2 +-
.../api/score/PolymorphicScoreJaxbAdapter.java | 6 +-
.../impl/domain/solution/JaxbSolutionFileIO.java | 8 +-
.../api/score/AbstractScoreJaxbAdapterTest.java | 8 +-
.../api/score/PolymorphicScoreJaxbAdapterTest.java | 4 +-
.../bendable/BendableScoreJaxbAdapterTest.java | 4 +-
.../BendableBigDecimalScoreJaxbAdapterTest.java | 4 +-
.../BendableLongScoreJaxbAdapterTest.java | 4 +-
.../HardMediumSoftScoreJaxbAdapterTest.java | 4 +-
...rdMediumSoftBigDecimalScoreJaxbAdapterTest.java | 4 +-
.../HardMediumSoftLongScoreJaxbAdapterTest.java | 4 +-
.../hardsoft/HardSoftScoreJaxbAdapterTest.java | 4 +-
.../HardSoftBigDecimalScoreJaxbAdapterTest.java | 4 +-
.../HardSoftLongScoreJaxbAdapterTest.java | 4 +-
.../buildin/simple/SimpleScoreJaxbAdapterTest.java | 4 +-
.../SimpleBigDecimalScoreJaxbAdapterTest.java | 4 +-
.../simplelong/SimpleLongScoreJaxbAdapterTest.java | 4 +-
.../impl/testdata/domain/JaxbTestdataEntity.java | 4 +-
.../impl/testdata/domain/JaxbTestdataObject.java | 2 +-
.../impl/testdata/domain/JaxbTestdataSolution.java | 8 +-
.../impl/testdata/domain/JaxbTestdataValue.java | 2 +-
.../optaplanner-persistence-jpa/pom.xml | 25 +--
.../buildin/bendable/BendableScoreConverter.java | 4 +-
.../BendableBigDecimalScoreConverter.java | 4 +-
.../bendablelong/BendableLongScoreConverter.java | 4 +-
.../HardMediumSoftScoreConverter.java | 4 +-
.../HardMediumSoftBigDecimalScoreConverter.java | 4 +-
.../HardMediumSoftLongScoreConverter.java | 4 +-
.../buildin/hardsoft/HardSoftScoreConverter.java | 4 +-
.../HardSoftBigDecimalScoreConverter.java | 4 +-
.../hardsoftlong/HardSoftLongScoreConverter.java | 4 +-
.../score/buildin/simple/SimpleScoreConverter.java | 4 +-
.../SimpleBigDecimalScoreConverter.java | 4 +-
.../simplelong/SimpleLongScoreConverter.java | 4 +-
.../jpa/impl/score/AbstractScoreHibernateType.java | 248 ---------------------
.../bendable/BendableScoreHibernateType.java | 51 -----
.../BendableBigDecimalScoreHibernateType.java | 51 -----
.../BendableLongScoreHibernateType.java | 50 -----
.../HardMediumSoftScoreHibernateType.java | 45 ----
...HardMediumSoftBigDecimalScoreHibernateType.java | 46 ----
.../HardMediumSoftLongScoreHibernateType.java | 45 ----
.../hardsoft/HardSoftScoreHibernateType.java | 45 ----
.../HardSoftBigDecimalScoreHibernateType.java | 45 ----
.../HardSoftLongScoreHibernateType.java | 45 ----
.../buildin/simple/SimpleScoreHibernateType.java | 45 ----
.../SimpleBigDecimalScoreHibernateType.java | 45 ----
.../simplelong/SimpleLongScoreHibernateType.java | 45 ----
.../bendable/BendableScoreConverterTest.java | 4 +-
.../BendableBigDecimalScoreConverterTest.java | 4 +-
.../BendableLongScoreConverterTest.java | 4 +-
.../HardMediumSoftScoreConverterTest.java | 4 +-
...HardMediumSoftBigDecimalScoreConverterTest.java | 4 +-
.../HardMediumSoftLongScoreConverterTest.java | 4 +-
.../hardsoft/HardSoftScoreConverterTest.java | 4 +-
.../HardSoftBigDecimalScoreConverterTest.java | 4 +-
.../HardSoftLongScoreConverterTest.java | 4 +-
.../buildin/simple/SimpleScoreConverterTest.java | 4 +-
.../SimpleBigDecimalScoreConverterTest.java | 4 +-
.../simplelong/SimpleLongScoreConverterTest.java | 4 +-
.../persistence/jpa/impl/AbstractScoreJpaTest.java | 14 +-
.../bendable/BendableScoreHibernateTypeTest.java | 71 ------
.../BendableBigDecimalScoreHibernateTypeTest.java | 86 -------
.../BendableLongScoreHibernateTypeTest.java | 73 ------
.../HardMediumSoftScoreHibernateTypeTest.java | 70 ------
...MediumSoftBigDecimalScoreHibernateTypeTest.java | 78 -------
.../HardMediumSoftLongScoreHibernateTypeTest.java | 71 ------
.../hardsoft/HardSoftScoreHibernateTypeTest.java | 69 ------
.../HardSoftBigDecimalScoreHibernateTypeTest.java | 75 -------
.../HardSoftLongScoreHibernateTypeTest.java | 69 ------
.../simple/SimpleScoreHibernateTypeTest.java | 69 ------
.../SimpleBigDecimalScoreHibernateTypeTest.java | 71 ------
.../SimpleLongScoreHibernateTypeTest.java | 69 ------
.../optaplanner-persistence-jsonb/pom.xml | 16 +-
.../jsonb/api/OptaPlannerJsonbConfig.java | 8 +-
.../jsonb/api/score/AbstractScoreJsonbAdapter.java | 2 +-
.../jsonb/api/AbstractJsonbJsonAdapterTest.java | 6 +-
.../jsonb/api/OptaPlannerJsonbConfigTest.java | 6 +-
.../api/score/AbstractScoreJsonbAdapterTest.java | 6 +-
.../bendable/BendableScoreJsonbAdapterTest.java | 2 +-
.../BendableBigDecimalScoreJsonbAdapterTest.java | 2 +-
.../BendableLongScoreJsonbAdapterTest.java | 2 +-
.../HardMediumSoftScoreJsonbAdapterTest.java | 2 +-
...dMediumSoftBigDecimalScoreJsonbAdapterTest.java | 2 +-
.../HardMediumSoftLongScoreJsonbAdapterTest.java | 2 +-
.../hardsoft/HardSoftScoreJsonbAdapterTest.java | 2 +-
.../HardSoftBigDecimalScoreJsonbAdapterTest.java | 2 +-
.../HardSoftLongScoreJsonbAdapterTest.java | 2 +-
.../simple/SimpleScoreJsonbAdapterTest.java | 2 +-
.../SimpleBigDecimalScoreJsonbAdapterTest.java | 2 +-
.../SimpleLongScoreJsonbAdapterTest.java | 2 +-
.../optaplanner-persistence-xstream/pom.xml | 2 +-
optaplanner-persistence/pom.xml | 2 +-
.../deployment/pom.xml | 2 +-
...annerBenchmarkProcessorBenchmarkConfigTest.java | 2 +-
...hmarkProcessorInheritedSolverBenchmarkTest.java | 2 +-
...nerBenchmarkProcessorNoBenchmarkConfigTest.java | 2 +-
...nnerBenchmarkProcessorOnlySolverConfigTest.java | 2 +-
.../OptaPlannerBenchmarkProcessorPhasesTest.java | 2 +-
...cessorSpentLimitConfiguredPerBenchmarkTest.java | 2 +-
.../integration-test/pom.xml | 2 +-
.../it/OptaPlannerBenchmarkTestResource.java | 10 +-
.../optaplanner-quarkus-benchmark/pom.xml | 2 +-
.../optaplanner-quarkus-benchmark/runtime/pom.xml | 2 +-
.../quarkus/OptaPlannerBenchmarkBeanProvider.java | 4 +-
...navailableOptaPlannerBenchmarkBeanProvider.java | 4 +-
.../optaplanner-quarkus-jackson/deployment/pom.xml | 2 +-
.../integration-test/pom.xml | 2 +-
.../jackson/it/OptaPlannerTestResource.java | 6 +-
.../optaplanner-quarkus-jackson/pom.xml | 2 +-
.../optaplanner-quarkus-jackson/runtime/pom.xml | 2 +-
.../jackson/OptaPlannerObjectMapperCustomizer.java | 2 +-
.../optaplanner-quarkus-jsonb/deployment/pom.xml | 2 +-
.../integration-test/pom.xml | 2 +-
.../quarkus/jsonb/it/OptaPlannerTestResource.java | 6 +-
.../optaplanner-quarkus-jsonb/pom.xml | 2 +-
.../optaplanner-quarkus-jsonb/runtime/pom.xml | 2 +-
.../jsonb/OptaPlannerJsonbConfigCustomizer.java | 4 +-
.../optaplanner-quarkus/deployment/pom.xml | 2 +-
.../GizmoMemberAccessorEntityEnhancer.java | 2 +-
.../quarkus/deployment/OptaPlannerProcessor.java | 2 +-
.../OptaPlannerProcessorChainedXMLNoneTest.java | 2 +-
...aPlannerProcessorExtendedSolutionSolveTest.java | 2 +-
...PlannerProcessorGeneratedGizmoSupplierTest.java | 2 +-
.../OptaPlannerProcessorGizmoKitchenSinkTest.java | 2 +-
.../OptaPlannerProcessorInterfaceEntityTest.java | 2 +-
.../quarkus/OptaPlannerProcessorInvalidTest.java | 2 +-
...taPlannerProcessorOnlyMultiConstructorTest.java | 2 +-
...erProcessorOverridePropertiesAtRuntimeTest.java | 10 +-
.../OptaPlannerProcessorPlanningIdTest.java | 2 +-
...OptaPlannerProcessorPrivateConstructorTest.java | 2 +-
.../quarkus/OptaPlannerProcessorSolveTest.java | 2 +-
...aPlannerProcessorSolverPropertiesBavetTest.java | 2 +-
.../OptaPlannerProcessorSolverPropertiesTest.java | 2 +-
.../OptaPlannerProcessorXMLDefaultTest.java | 2 +-
.../quarkus/OptaPlannerProcessorXMLNoneTest.java | 2 +-
.../OptaPlannerProcessorXMLPropertyTest.java | 2 +-
...OptaPlannerProcessorConstraintProviderTest.java | 2 +-
...aPlannerProcessorConstraintsDrlDefaultTest.java | 2 +-
.../OptaPlannerProcessorConstraintsDrlTest.java | 2 +-
.../quarkus/rest/SolverConfigTestResource.java | 12 +-
...annerConstraintVerifierBavetStreamImplTest.java | 2 +-
...nnerConstraintVerifierDroolsStreamImplTest.java | 2 +-
.../OptaPlannerConstraintVerifierTest.java | 2 +-
.../devui-integration-test/pom.xml | 4 +-
.../quarkus/it/devui/OptaPlannerTestResource.java | 10 +-
.../drl-integration-test/pom.xml | 2 +-
.../quarkus/drl/it/OptaPlannerTestResource.java | 10 +-
.../optaplanner-quarkus/integration-test/pom.xml | 2 +-
.../quarkus/it/OptaPlannerTestResource.java | 10 +-
.../optaplanner-quarkus/pom.xml | 2 +-
.../reflection-integration-test/pom.xml | 2 +-
.../it/reflection/OptaPlannerTestResource.java | 10 +-
.../optaplanner-quarkus/runtime/pom.xml | 2 +-
.../bean/DefaultOptaPlannerBeanProvider.java | 6 +-
.../bean/UnavailableOptaPlannerBeanProvider.java | 4 +-
.../nativeimage/Substitute_ConfigUtils.java | 2 +-
optaplanner-quarkus-integration/pom.xml | 2 +-
.../optaplanner-spring-boot-autoconfigure/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.factories | 1 -
.../optaplanner-spring-boot-starter/pom.xml | 2 +-
optaplanner-spring-integration/pom.xml | 2 +-
optaplanner-test/pom.xml | 5 +-
pom.xml | 2 +-
330 files changed, 592 insertions(+), 2296 deletions(-)
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index d4823b9169..94a37ff999 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
- java-version: [ 11, 17, 20 ]
+ java-version: [ 17, 20 ]
maven-version: [ '3.8.7' ]
fail-fast: false
runs-on: ${{ matrix.os }}
diff --git a/build/optaplanner-bom/pom.xml b/build/optaplanner-bom/pom.xml
index f093d665bc..2a2fc42490 100644
--- a/build/optaplanner-bom/pom.xml
+++ b/build/optaplanner-bom/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/build/optaplanner-build-parent/pom.xml b/build/optaplanner-build-parent/pom.xml
index 9655d2bac8..f7c6f60e35 100644
--- a/build/optaplanner-build-parent/pom.xml
+++ b/build/optaplanner-build-parent/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -42,11 +42,11 @@
<version.org.drools>8.44.0.Final</version.org.drools>
<!-- Normal dependency versions -->
- <version.ch.qos.logback>1.2.9</version.ch.qos.logback>
+ <version.ch.qos.logback>1.4.6</version.ch.qos.logback>
<version.org.apache.logging.log4j>2.20.0</version.org.apache.logging.log4j>
<version.com.thoughtworks.xstream>1.4.20</version.com.thoughtworks.xstream>
- <version.io.quarkiverse.operatorsdk>5.1.4</version.io.quarkiverse.operatorsdk>
- <version.io.quarkus>2.16.10.Final</version.io.quarkus>
+ <version.io.quarkiverse.operatorsdk>6.0.3</version.io.quarkiverse.operatorsdk>
+ <version.io.quarkus>3.2.9.Final</version.io.quarkus>
<version.org.apache.commons.math3>3.6.1</version.org.apache.commons.math3>
<version.org.apache.commons.text>1.10.0</version.org.apache.commons.text>
<version.org.apache.poi>5.2.3</version.org.apache.poi>
@@ -55,9 +55,9 @@
<version.org.jdom2>2.0.6.1</version.org.jdom2>
<version.org.jfree.jfreechart>1.5.4</version.org.jfree.jfreechart>
<version.org.openrewrite.recipe>1.19.3</version.org.openrewrite.recipe>
- <version.org.slf4j>1.7.36</version.org.slf4j><!-- TODO keep in sync with quarkus-bom -->
- <version.org.springframework>5.3.27</version.org.springframework>
- <version.org.springframework.boot>2.7.12</version.org.springframework.boot>
+ <version.org.slf4j>2.0.6</version.org.slf4j><!-- TODO keep in sync with quarkus-bom -->
+ <version.org.springframework>6.0.8</version.org.springframework>
+ <version.org.springframework.boot>3.0.7</version.org.springframework.boot>
<!-- ************************************************************************ -->
<!-- Plugins -->
@@ -76,7 +76,7 @@
Do not upgrade unless prepared to deal with JPMS issues.
If upgrading, ensure build still passes with the full profile (-Dfull).
-->
- <version.jaxb2.plugin>2.5.0</version.jaxb2.plugin>
+ <version.jaxb2.plugin>3.1.0</version.jaxb2.plugin>
<version.pitest.plugin>1.14.4</version.pitest.plugin>
<version.revapi.plugin>0.15.0</version.revapi.plugin>
<version.sniffer.plugin>1.23</version.sniffer.plugin>
diff --git a/build/optaplanner-distribution-internal/pom.xml b/build/optaplanner-distribution-internal/pom.xml
index 490d2c7d82..5614f5f418 100644
--- a/build/optaplanner-distribution-internal/pom.xml
+++ b/build/optaplanner-distribution-internal/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../optaplanner-build-parent/pom.xml</relativePath>
</parent>
diff --git a/build/optaplanner-ide-config/pom.xml b/build/optaplanner-ide-config/pom.xml
index 26be4a00c3..fa50983d11 100644
--- a/build/optaplanner-ide-config/pom.xml
+++ b/build/optaplanner-ide-config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>optaplanner-ide-config</artifactId>
diff --git a/build/optaplanner-javadoc/pom.xml b/build/optaplanner-javadoc/pom.xml
index 57c6d4a902..4efc94fb69 100644
--- a/build/optaplanner-javadoc/pom.xml
+++ b/build/optaplanner-javadoc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../optaplanner-build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -83,10 +83,6 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
diff --git a/core/optaplanner-constraint-drl/pom.xml b/core/optaplanner-constraint-drl/pom.xml
index 2a96c0820a..0de1fb47bd 100644
--- a/core/optaplanner-constraint-drl/pom.xml
+++ b/core/optaplanner-constraint-drl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/core/optaplanner-constraint-streams-bavet/pom.xml b/core/optaplanner-constraint-streams-bavet/pom.xml
index 56fdc7f966..d67a0ae8aa 100644
--- a/core/optaplanner-constraint-streams-bavet/pom.xml
+++ b/core/optaplanner-constraint-streams-bavet/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/core/optaplanner-constraint-streams-common/pom.xml b/core/optaplanner-constraint-streams-common/pom.xml
index 8668fdb2bf..50707b0d24 100644
--- a/core/optaplanner-constraint-streams-common/pom.xml
+++ b/core/optaplanner-constraint-streams-common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/core/optaplanner-constraint-streams-drools/pom.xml b/core/optaplanner-constraint-streams-drools/pom.xml
index b91e705140..c36553ee43 100644
--- a/core/optaplanner-constraint-streams-drools/pom.xml
+++ b/core/optaplanner-constraint-streams-drools/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/core/optaplanner-core-impl/pom.xml b/core/optaplanner-core-impl/pom.xml
index a093683d8e..f7754f08cd 100644
--- a/core/optaplanner-core-impl/pom.xml
+++ b/core/optaplanner-core-impl/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-core-impl</artifactId>
@@ -140,6 +140,9 @@
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/api/domain/common/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/api/domain/common/package-info.java
index b64a4c796e..147c0769a6 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/api/domain/common/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/api/domain/common/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.api.domain.common;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
\ No newline at end of file
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/api/score/stream/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/api/score/stream/package-info.java
index 784a1e0968..3a86039bce 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/api/score/stream/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/api/score/stream/package-info.java
@@ -21,6 +21,6 @@
@XmlSchema(namespace = SolverConfig.XML_NAMESPACE)
package org.optaplanner.core.api.score.stream;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/AbstractConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/AbstractConfig.java
index 82aa22ec28..a076371acb 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/AbstractConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/AbstractConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
/**
* A config class is a user-friendly, validating configuration class that maps XML input.
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicPhaseConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicPhaseConfig.java
index cc8ea1d57b..0ae809dd91 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicPhaseConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicPhaseConfig.java
@@ -22,9 +22,9 @@ package org.optaplanner.core.config.constructionheuristic;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.constructionheuristic.decider.forager.ConstructionHeuristicForagerConfig;
import org.optaplanner.core.config.constructionheuristic.placer.EntityPlacerConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicType.java
index ca24f6de3c..5e801dbbfb 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/ConstructionHeuristicType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.constructionheuristic;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySorterManner;
import org.optaplanner.core.config.heuristic.selector.value.ValueSorterManner;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/ConstructionHeuristicForagerConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/ConstructionHeuristicForagerConfig.java
index 05908c03cb..0b2ed91df3 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/ConstructionHeuristicForagerConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/ConstructionHeuristicForagerConfig.java
@@ -21,7 +21,7 @@ package org.optaplanner.core.config.constructionheuristic.decider.forager;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.AbstractConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/ConstructionHeuristicPickEarlyType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/ConstructionHeuristicPickEarlyType.java
index c7d5b09ac6..f56cc263cc 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/ConstructionHeuristicPickEarlyType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/ConstructionHeuristicPickEarlyType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.constructionheuristic.decider.forager;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
@XmlEnum
public enum ConstructionHeuristicPickEarlyType {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/package-info.java
index c21f3f42a8..23e25631bf 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/decider/forager/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.constructionheuristic.decider.forager;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/package-info.java
index d5ee8c215b..e96223e883 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.constructionheuristic;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/EntityPlacerConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/EntityPlacerConfig.java
index 088214dac0..f7220ad738 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/EntityPlacerConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/EntityPlacerConfig.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.constructionheuristic.placer;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
import org.optaplanner.core.config.AbstractConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/PooledEntityPlacerConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/PooledEntityPlacerConfig.java
index a62075a864..70401425f9 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/PooledEntityPlacerConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/PooledEntityPlacerConfig.java
@@ -21,9 +21,9 @@ package org.optaplanner.core.config.constructionheuristic.placer;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.composite.CartesianProductMoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/QueuedEntityPlacerConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/QueuedEntityPlacerConfig.java
index 39d2c5e47a..dd480518bf 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/QueuedEntityPlacerConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/QueuedEntityPlacerConfig.java
@@ -23,9 +23,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/QueuedValuePlacerConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/QueuedValuePlacerConfig.java
index b50da8d0ac..4566b974ce 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/QueuedValuePlacerConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/QueuedValuePlacerConfig.java
@@ -21,9 +21,9 @@ package org.optaplanner.core.config.constructionheuristic.placer;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.composite.CartesianProductMoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/package-info.java
index 25aba29c3e..5c80712db1 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/constructionheuristic/placer/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.constructionheuristic.placer;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchPhaseConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchPhaseConfig.java
index a7e6b391c3..31205279fa 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchPhaseConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchPhaseConfig.java
@@ -21,9 +21,9 @@ package org.optaplanner.core.config.exhaustivesearch;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySelectorConfig;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySorterManner;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchType.java
index 07253597b7..6386d0477e 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/ExhaustiveSearchType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.exhaustivesearch;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySorterManner;
import org.optaplanner.core.config.heuristic.selector.value.ValueSorterManner;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/NodeExplorationType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/NodeExplorationType.java
index ed7209c460..874eb4bdad 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/NodeExplorationType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/NodeExplorationType.java
@@ -21,7 +21,7 @@ package org.optaplanner.core.config.exhaustivesearch;
import java.util.Comparator;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.impl.exhaustivesearch.node.ExhaustiveSearchNode;
import org.optaplanner.core.impl.exhaustivesearch.node.comparator.BreadthFirstNodeComparator;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/package-info.java
index 2b82bede63..66e1466292 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/exhaustivesearch/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.exhaustivesearch;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionCacheType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionCacheType.java
index 3f5a81ba0c..8cc686be26 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionCacheType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionCacheType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.heuristic.selector.common;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
/**
* There is no INHERIT by design because 2 sequential caches provides no benefit, only memory overhead.
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionOrder.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionOrder.java
index 6191a7dd40..bbde2dae29 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionOrder.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/SelectionOrder.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.heuristic.selector.common;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/decorator/SelectionSorterOrder.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/decorator/SelectionSorterOrder.java
index 646fb78799..07d60382f9 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/decorator/SelectionSorterOrder.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/decorator/SelectionSorterOrder.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.heuristic.selector.common.decorator;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.impl.heuristic.selector.common.decorator.SelectionSorter;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/decorator/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/decorator/package-info.java
index 8ca21eaf45..7e2df85086 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/decorator/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/decorator/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.common.decorator;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/NearbySelectionConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/NearbySelectionConfig.java
index 04a220b099..d0e4d903bd 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/NearbySelectionConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/NearbySelectionConfig.java
@@ -23,8 +23,8 @@ import java.util.Objects;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
import org.optaplanner.core.config.heuristic.selector.common.SelectionCacheType;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/NearbySelectionDistributionType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/NearbySelectionDistributionType.java
index df9eabc3a2..49c5d6f033 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/NearbySelectionDistributionType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/NearbySelectionDistributionType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.heuristic.selector.common.nearby;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
@XmlEnum
public enum NearbySelectionDistributionType {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/package-info.java
index b23798382f..6f553478d3 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/nearby/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.common.nearby;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/package-info.java
index fb432ef458..6e6671b740 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/common/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.common;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/EntitySelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/EntitySelectorConfig.java
index 2016801e47..c74753a13b 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/EntitySelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/EntitySelectorConfig.java
@@ -22,9 +22,9 @@ package org.optaplanner.core.config.heuristic.selector.entity;
import java.util.Comparator;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.api.domain.entity.PlanningEntity;
import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/EntitySorterManner.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/EntitySorterManner.java
index 2a12b9d5e4..01e4a99797 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/EntitySorterManner.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/EntitySorterManner.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.heuristic.selector.entity;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.api.domain.entity.PlanningEntity;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/package-info.java
index 56c641dcff..1d51d8fa65 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.entity;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/PillarSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/PillarSelectorConfig.java
index 5b4dd1be74..fdc6d5e563 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/PillarSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/PillarSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.entity.pillar;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/SubPillarConfigPolicy.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/SubPillarConfigPolicy.java
index 4c66378ebf..b27429452b 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/SubPillarConfigPolicy.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/SubPillarConfigPolicy.java
@@ -22,7 +22,7 @@ package org.optaplanner.core.config.heuristic.selector.entity.pillar;
import java.util.Comparator;
import java.util.Objects;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType(propOrder = {
"subPillarEnabled",
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/package-info.java
index d84e710c16..7979ae3f38 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/entity/pillar/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.entity.pillar;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/DestinationSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/DestinationSelectorConfig.java
index ee9e033fe1..0f92188104 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/DestinationSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/DestinationSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.list;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
import org.optaplanner.core.config.heuristic.selector.common.nearby.NearbySelectionConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/SubListSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/SubListSelectorConfig.java
index dee495602a..f4e313a301 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/SubListSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/SubListSelectorConfig.java
@@ -21,9 +21,9 @@ package org.optaplanner.core.config.heuristic.selector.list;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
import org.optaplanner.core.config.heuristic.selector.common.nearby.NearbySelectionConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/package-info.java
index ca879eb962..750f3ea834 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/list/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.list;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/MoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/MoveSelectorConfig.java
index 5e6f19e816..481da83cf1 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/MoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/MoveSelectorConfig.java
@@ -23,8 +23,8 @@ import java.util.Comparator;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
import org.optaplanner.core.config.heuristic.selector.common.SelectionCacheType;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/CartesianProductMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/CartesianProductMoveSelectorConfig.java
index 8edb4b2515..6cce7486d9 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/CartesianProductMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/CartesianProductMoveSelectorConfig.java
@@ -23,9 +23,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.factory.MoveIteratorFactoryConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/UnionMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/UnionMoveSelectorConfig.java
index caad83a64e..c91e6d6f6b 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/UnionMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/UnionMoveSelectorConfig.java
@@ -23,9 +23,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.factory.MoveIteratorFactoryConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/package-info.java
index eca0415ac8..bacf19c200 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/composite/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.move.composite;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/MoveIteratorFactoryConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/MoveIteratorFactoryConfig.java
index edb49c902a..2988cba8dd 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/MoveIteratorFactoryConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/MoveIteratorFactoryConfig.java
@@ -22,8 +22,8 @@ package org.optaplanner.core.config.heuristic.selector.move.factory;
import java.util.Map;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/MoveListFactoryConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/MoveListFactoryConfig.java
index c1435d026a..5561b9e6d5 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/MoveListFactoryConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/MoveListFactoryConfig.java
@@ -22,8 +22,8 @@ package org.optaplanner.core.config.heuristic.selector.move.factory;
import java.util.Map;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/package-info.java
index c4c5852281..3e2fa56019 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/factory/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.move.factory;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/AbstractPillarMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/AbstractPillarMoveSelectorConfig.java
index faec1f954b..992e45305a 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/AbstractPillarMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/AbstractPillarMoveSelectorConfig.java
@@ -22,8 +22,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic;
import java.util.Comparator;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.entity.pillar.PillarSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/ChangeMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/ChangeMoveSelectorConfig.java
index 7c966892c4..88a3e03d36 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/ChangeMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/ChangeMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/PillarChangeMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/PillarChangeMoveSelectorConfig.java
index 25ab5d75b9..d7df3ec0ac 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/PillarChangeMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/PillarChangeMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.value.ValueSelectorConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/PillarSwapMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/PillarSwapMoveSelectorConfig.java
index 4f1c84cc0e..d674f22b7d 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/PillarSwapMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/PillarSwapMoveSelectorConfig.java
@@ -22,9 +22,9 @@ package org.optaplanner.core.config.heuristic.selector.move.generic;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.entity.pillar.PillarSelectorConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/SubPillarType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/SubPillarType.java
index bba2ee5baf..b52175d471 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/SubPillarType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/SubPillarType.java
@@ -21,7 +21,7 @@ package org.optaplanner.core.config.heuristic.selector.move.generic;
import java.util.Comparator;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
@XmlEnum
public enum SubPillarType {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/SwapMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/SwapMoveSelectorConfig.java
index 87a40af9cc..7f9390e051 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/SwapMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/SwapMoveSelectorConfig.java
@@ -23,9 +23,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/KOptMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/KOptMoveSelectorConfig.java
index a1ea86f37a..6134674ed4 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/KOptMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/KOptMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic.chained;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/SubChainChangeMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/SubChainChangeMoveSelectorConfig.java
index 171442660c..1478bf0059 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/SubChainChangeMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/SubChainChangeMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic.chained;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.value.ValueSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/SubChainSwapMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/SubChainSwapMoveSelectorConfig.java
index 4f1b6fa07c..74ca0fec5a 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/SubChainSwapMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/SubChainSwapMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic.chained;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.value.chained.SubChainSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/TailChainSwapMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/TailChainSwapMoveSelectorConfig.java
index 9bfb564f39..62bb525c4f 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/TailChainSwapMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/TailChainSwapMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic.chained;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.entity.EntitySelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/package-info.java
index bd5df2a3db..1484c4b4f5 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/chained/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.move.generic.chained;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/ListChangeMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/ListChangeMoveSelectorConfig.java
index 07ae0d1ffb..4162d43f22 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/ListChangeMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/ListChangeMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic.list;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.list.DestinationSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/ListSwapMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/ListSwapMoveSelectorConfig.java
index 11eb2837f7..95c417960c 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/ListSwapMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/ListSwapMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic.list;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.value.ValueSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/SubListChangeMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/SubListChangeMoveSelectorConfig.java
index ef7166e248..6a7e807710 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/SubListChangeMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/SubListChangeMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic.list;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.list.DestinationSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.list.SubListSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/SubListSwapMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/SubListSwapMoveSelectorConfig.java
index 07d7eb062f..1115637244 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/SubListSwapMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/SubListSwapMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic.list;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.list.SubListSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/kopt/KOptListMoveSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/kopt/KOptListMoveSelectorConfig.java
index 9c6d1105b3..f0765e49c3 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/kopt/KOptListMoveSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/kopt/KOptListMoveSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.move.generic.list.kopt;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.value.ValueSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/kopt/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/kopt/package-info.java
index 2bce53877f..97f63c4823 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/kopt/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/kopt/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.move.generic.list.kopt;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/package-info.java
index ef5a3f0ffd..f573822c0a 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/list/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.move.generic.list;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/package-info.java
index 4114b070ff..d6b981d324 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/generic/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.move.generic;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/package-info.java
index fcfcaf7810..cde74f1a8f 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/move/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.move;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/package-info.java
index 93cc248cad..d431cc22e7 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/ValueSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/ValueSelectorConfig.java
index 86b145f20e..a1a7312d4e 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/ValueSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/ValueSelectorConfig.java
@@ -22,9 +22,9 @@ package org.optaplanner.core.config.heuristic.selector.value;
import java.util.Comparator;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.api.domain.variable.PlanningVariable;
import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/ValueSorterManner.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/ValueSorterManner.java
index dedcf2f4f2..4d4d8e96ba 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/ValueSorterManner.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/ValueSorterManner.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.heuristic.selector.value;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.api.domain.variable.PlanningVariable;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/chained/SubChainSelectorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/chained/SubChainSelectorConfig.java
index 9e73c0f4c1..13b08dd0d4 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/chained/SubChainSelectorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/chained/SubChainSelectorConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.core.config.heuristic.selector.value.chained;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.SelectorConfig;
import org.optaplanner.core.config.heuristic.selector.value.ValueSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/chained/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/chained/package-info.java
index 515116d454..e121c106e2 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/chained/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/chained/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.value.chained;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/package-info.java
index c650513a0b..0b0295bc74 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/heuristic/selector/value/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.heuristic.selector.value;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/LocalSearchPhaseConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/LocalSearchPhaseConfig.java
index 1d6195c585..d66534ef89 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/LocalSearchPhaseConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/LocalSearchPhaseConfig.java
@@ -21,9 +21,9 @@ package org.optaplanner.core.config.localsearch;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.heuristic.selector.move.MoveSelectorConfig;
import org.optaplanner.core.config.heuristic.selector.move.composite.CartesianProductMoveSelectorConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/LocalSearchType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/LocalSearchType.java
index 00dc631da7..59059c2e92 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/LocalSearchType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/LocalSearchType.java
@@ -21,7 +21,7 @@ package org.optaplanner.core.config.localsearch;
import java.util.Arrays;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
@XmlEnum
public enum LocalSearchType {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/AcceptorType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/AcceptorType.java
index 69d5f5d9b0..3082322ce3 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/AcceptorType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/AcceptorType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.localsearch.decider.acceptor;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
@XmlEnum
public enum AcceptorType {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/LocalSearchAcceptorConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/LocalSearchAcceptorConfig.java
index 298ac27a1e..08a54e0ffd 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/LocalSearchAcceptorConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/LocalSearchAcceptorConfig.java
@@ -22,8 +22,8 @@ package org.optaplanner.core.config.localsearch.decider.acceptor;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.AbstractConfig;
import org.optaplanner.core.config.localsearch.decider.acceptor.stepcountinghillclimbing.StepCountingHillClimbingType;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/package-info.java
index 252c11b878..61aa59961f 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.localsearch.decider.acceptor;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/stepcountinghillclimbing/StepCountingHillClimbingType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/stepcountinghillclimbing/StepCountingHillClimbingType.java
index faeb15eb02..76cecf1698 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/stepcountinghillclimbing/StepCountingHillClimbingType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/stepcountinghillclimbing/StepCountingHillClimbingType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.localsearch.decider.acceptor.stepcountinghillclimbing;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.api.score.Score;
import org.optaplanner.core.config.localsearch.decider.forager.LocalSearchForagerConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/stepcountinghillclimbing/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/stepcountinghillclimbing/package-info.java
index c8827f79e5..13a51b9766 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/stepcountinghillclimbing/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/acceptor/stepcountinghillclimbing/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.localsearch.decider.acceptor.stepcountinghillclimbing;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/FinalistPodiumType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/FinalistPodiumType.java
index d36bdcb542..aca45dc2cd 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/FinalistPodiumType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/FinalistPodiumType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.localsearch.decider.forager;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.impl.localsearch.decider.forager.finalist.FinalistPodium;
import org.optaplanner.core.impl.localsearch.decider.forager.finalist.HighestScoreFinalistPodium;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/LocalSearchForagerConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/LocalSearchForagerConfig.java
index b5d5c76908..c0faf91d98 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/LocalSearchForagerConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/LocalSearchForagerConfig.java
@@ -21,7 +21,7 @@ package org.optaplanner.core.config.localsearch.decider.forager;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.AbstractConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/LocalSearchPickEarlyType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/LocalSearchPickEarlyType.java
index 26633fed1f..dce5bf89b2 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/LocalSearchPickEarlyType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/LocalSearchPickEarlyType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.localsearch.decider.forager;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
@XmlEnum
public enum LocalSearchPickEarlyType {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/package-info.java
index 9fc571666b..7715f6367e 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/decider/forager/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.localsearch.decider.forager;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/package-info.java
index 02c7e2ecf5..5ae86fc8a8 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/localsearch/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.localsearch;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/package-info.java
index 283c76f657..3f10e88fab 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/package-info.java
@@ -28,7 +28,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/partitionedsearch/PartitionedSearchPhaseConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/partitionedsearch/PartitionedSearchPhaseConfig.java
index ab98bca5a9..13a781b8f9 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/partitionedsearch/PartitionedSearchPhaseConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/partitionedsearch/PartitionedSearchPhaseConfig.java
@@ -23,10 +23,10 @@ import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.optaplanner.core.api.score.director.ScoreDirector;
import org.optaplanner.core.api.solver.Solver;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/partitionedsearch/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/partitionedsearch/package-info.java
index c5e62a2d58..146a330cb9 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/partitionedsearch/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/partitionedsearch/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.partitionedsearch;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/PhaseConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/PhaseConfig.java
index 01c5e2a92e..b770504614 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/PhaseConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/PhaseConfig.java
@@ -19,9 +19,9 @@
package org.optaplanner.core.config.phase;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.AbstractConfig;
import org.optaplanner.core.config.constructionheuristic.ConstructionHeuristicPhaseConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/custom/CustomPhaseConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/custom/CustomPhaseConfig.java
index 0225c5d405..cda7bb3a4a 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/custom/CustomPhaseConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/custom/CustomPhaseConfig.java
@@ -24,10 +24,10 @@ import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.optaplanner.core.config.phase.PhaseConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/custom/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/custom/package-info.java
index 8cb43999e5..b6ae943898 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/custom/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/custom/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.phase.custom;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/package-info.java
index 41ba1bc277..e431fe62c0 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/phase/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.phase;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/definition/ScoreDefinitionType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/definition/ScoreDefinitionType.java
index 0a9c3a5e8c..ce77eb4dd1 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/definition/ScoreDefinitionType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/definition/ScoreDefinitionType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.score.definition;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
@XmlEnum
public enum ScoreDefinitionType {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/definition/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/definition/package-info.java
index 58bb072d06..7bea222560 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/definition/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/definition/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.score.definition;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/director/ScoreDirectorFactoryConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/director/ScoreDirectorFactoryConfig.java
index 569c2140a6..0418d1ce32 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/director/ScoreDirectorFactoryConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/director/ScoreDirectorFactoryConfig.java
@@ -27,10 +27,10 @@ import java.util.Objects;
import java.util.function.Consumer;
import java.util.function.Supplier;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.optaplanner.core.api.score.calculator.EasyScoreCalculator;
import org.optaplanner.core.api.score.calculator.IncrementalScoreCalculator;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/director/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/director/package-info.java
index 467040ff85..e27e6e643c 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/director/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/director/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.score.director;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/trend/InitializingScoreTrendLevel.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/trend/InitializingScoreTrendLevel.java
index 1bd3d99814..d2b9a3f9b8 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/trend/InitializingScoreTrendLevel.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/trend/InitializingScoreTrendLevel.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.score.trend;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.api.domain.solution.PlanningSolution;
import org.optaplanner.core.api.score.Score;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/trend/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/trend/package-info.java
index 638d5ba31b..2c9ae93b64 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/trend/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/score/trend/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.score.trend;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/EnvironmentMode.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/EnvironmentMode.java
index 8d8425e289..004ab915c7 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/EnvironmentMode.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/EnvironmentMode.java
@@ -21,7 +21,7 @@ package org.optaplanner.core.config.solver;
import java.util.Random;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.api.solver.Solver;
import org.optaplanner.core.impl.heuristic.move.Move;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/SolverConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/SolverConfig.java
index dede0dda59..45deb9b84c 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/SolverConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/SolverConfig.java
@@ -36,11 +36,11 @@ import java.util.Objects;
import java.util.concurrent.ThreadFactory;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.api.domain.common.DomainAccessType;
import org.optaplanner.core.api.domain.solution.cloner.SolutionCloner;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/SolverManagerConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/SolverManagerConfig.java
index 870b7d49e8..f42a19f5d8 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/SolverManagerConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/SolverManagerConfig.java
@@ -22,7 +22,7 @@ package org.optaplanner.core.config.solver;
import java.util.concurrent.ThreadFactory;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.AbstractConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/MonitoringConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/MonitoringConfig.java
index 1d9915bb37..2a2620cd60 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/MonitoringConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/MonitoringConfig.java
@@ -22,8 +22,8 @@ package org.optaplanner.core.config.solver.monitoring;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.AbstractConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/SolverMetric.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/SolverMetric.java
index 7a2a02fb66..c699bdbdd6 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/SolverMetric.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/SolverMetric.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.core.api.score.Score;
import org.optaplanner.core.api.solver.Solver;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/package-info.java
index 4b2015a737..2131a5affa 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/monitoring/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.solver.monitoring;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/package-info.java
index c99762f604..547e4344fc 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/package-info.java
@@ -22,5 +22,5 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.solver;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/random/RandomType.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/random/RandomType.java
index 742f60201b..60677cf8d9 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/random/RandomType.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/random/RandomType.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.solver.random;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
/**
* Defines the pseudo random number generator.
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/random/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/random/package-info.java
index dd8b06b9ad..4c90d4df10 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/random/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/random/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.solver.random;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/TerminationCompositionStyle.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/TerminationCompositionStyle.java
index fc1d28ab8d..a76be33ace 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/TerminationCompositionStyle.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/TerminationCompositionStyle.java
@@ -19,7 +19,7 @@
package org.optaplanner.core.config.solver.termination;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
@XmlEnum
public enum TerminationCompositionStyle {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/TerminationConfig.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/TerminationConfig.java
index c4f579ed09..4758697f49 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/TerminationConfig.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/TerminationConfig.java
@@ -23,10 +23,10 @@ import java.time.Duration;
import java.util.List;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.optaplanner.core.config.AbstractConfig;
import org.optaplanner.core.config.util.ConfigUtils;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/package-info.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/package-info.java
index ba160cf3d8..8f38398d26 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/package-info.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/config/solver/termination/package-info.java
@@ -22,7 +22,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.core.config.solver.termination;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/GenericJaxbIO.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/GenericJaxbIO.java
index bc18ad4b41..4a4c536d3f 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/GenericJaxbIO.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/GenericJaxbIO.java
@@ -35,12 +35,13 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.util.ValidationEventCollector;
+
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 javax.xml.bind.util.ValidationEventCollector;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbCustomPropertiesAdapter.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbCustomPropertiesAdapter.java
index 81221535ea..9547d8cac2 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbCustomPropertiesAdapter.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbCustomPropertiesAdapter.java
@@ -23,10 +23,10 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbDurationAdapter.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbDurationAdapter.java
index cdd7ab5dc4..77c355a445 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbDurationAdapter.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbDurationAdapter.java
@@ -21,7 +21,7 @@ package org.optaplanner.core.impl.io.jaxb.adapter;
import java.time.Duration;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
// TODO: Move the code to the jaxb-ri
public class JaxbDurationAdapter extends XmlAdapter<String, Duration> {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbLocaleAdapter.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbLocaleAdapter.java
index 4aad4b5f4e..fdbc6dfb62 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbLocaleAdapter.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbLocaleAdapter.java
@@ -21,7 +21,7 @@ package org.optaplanner.core.impl.io.jaxb.adapter;
import java.util.Locale;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class JaxbLocaleAdapter extends XmlAdapter<String, Locale> {
diff --git a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbOffsetDateTimeAdapter.java b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbOffsetDateTimeAdapter.java
index ba8ca89d9e..0074620fa1 100644
--- a/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbOffsetDateTimeAdapter.java
+++ b/core/optaplanner-core-impl/src/main/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbOffsetDateTimeAdapter.java
@@ -25,7 +25,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;
// TODO: Move the code to the jaxb-ri
public class JaxbOffsetDateTimeAdapter extends XmlAdapter<String, OffsetDateTime> {
diff --git a/core/optaplanner-core-impl/src/test/java/org/optaplanner/core/impl/io/jaxb/GenericJaxbIOTest.java b/core/optaplanner-core-impl/src/test/java/org/optaplanner/core/impl/io/jaxb/GenericJaxbIOTest.java
index 4cf641012c..8399805782 100644
--- a/core/optaplanner-core-impl/src/test/java/org/optaplanner/core/impl/io/jaxb/GenericJaxbIOTest.java
+++ b/core/optaplanner-core-impl/src/test/java/org/optaplanner/core/impl/io/jaxb/GenericJaxbIOTest.java
@@ -28,9 +28,9 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.util.Objects;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlValue;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.impl.io.OptaPlannerXmlSerializationException;
diff --git a/core/optaplanner-core-impl/src/test/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbCustomPropertiesAdapterTest.java b/core/optaplanner-core-impl/src/test/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbCustomPropertiesAdapterTest.java
index b091775e90..8205596a47 100644
--- a/core/optaplanner-core-impl/src/test/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbCustomPropertiesAdapterTest.java
+++ b/core/optaplanner-core-impl/src/test/java/org/optaplanner/core/impl/io/jaxb/adapter/JaxbCustomPropertiesAdapterTest.java
@@ -25,13 +25,13 @@ import java.io.Reader;
import java.io.StringReader;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
diff --git a/core/optaplanner-core/pom.xml b/core/optaplanner-core/pom.xml
index 4d9c88e211..a119386319 100644
--- a/core/optaplanner-core/pom.xml
+++ b/core/optaplanner-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/core/pom.xml b/core/pom.xml
index 7738dc5199..0aef195d28 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/optaplanner-benchmark/pom.xml b/optaplanner-benchmark/pom.xml
index 3bfabef1bb..9f1747c338 100644
--- a/optaplanner-benchmark/pom.xml
+++ b/optaplanner-benchmark/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
@@ -170,6 +170,9 @@
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/PlannerBenchmarkConfig.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/PlannerBenchmarkConfig.java
index 7c144da599..14fc809f2b 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/PlannerBenchmarkConfig.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/PlannerBenchmarkConfig.java
@@ -34,12 +34,12 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.ThreadFactory;
-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.XmlType;
+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.XmlType;
import org.optaplanner.benchmark.api.PlannerBenchmarkFactory;
import org.optaplanner.benchmark.config.blueprint.SolverBenchmarkBluePrintConfig;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ProblemBenchmarksConfig.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ProblemBenchmarksConfig.java
index cc0c530227..871ab5a2a8 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ProblemBenchmarksConfig.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ProblemBenchmarksConfig.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.Objects;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.benchmark.config.statistic.ProblemStatisticType;
import org.optaplanner.benchmark.config.statistic.SingleStatisticType;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/SolverBenchmarkConfig.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/SolverBenchmarkConfig.java
index 2be7c0ef1f..73f63622fb 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/SolverBenchmarkConfig.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/SolverBenchmarkConfig.java
@@ -21,8 +21,8 @@ package org.optaplanner.benchmark.config;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.core.config.AbstractConfig;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/SolverBenchmarkBluePrintConfig.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/SolverBenchmarkBluePrintConfig.java
index 6638cda8c7..a31d08cb5f 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/SolverBenchmarkBluePrintConfig.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/SolverBenchmarkBluePrintConfig.java
@@ -21,7 +21,7 @@ package org.optaplanner.benchmark.config.blueprint;
import java.util.List;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
import org.optaplanner.benchmark.config.SolverBenchmarkConfig;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/SolverBenchmarkBluePrintType.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/SolverBenchmarkBluePrintType.java
index 2a31f4e6ae..1f56891143 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/SolverBenchmarkBluePrintType.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/SolverBenchmarkBluePrintType.java
@@ -22,7 +22,7 @@ package org.optaplanner.benchmark.config.blueprint;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.benchmark.config.SolverBenchmarkConfig;
import org.optaplanner.core.config.constructionheuristic.ConstructionHeuristicPhaseConfig;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/package-info.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/package-info.java
index 05bd2dd819..9d88757e12 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/package-info.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/blueprint/package-info.java
@@ -23,7 +23,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.benchmark.config.blueprint;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.benchmark.config.PlannerBenchmarkConfig;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/package-info.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/package-info.java
index 1f359e7f6e..d8fe4ae08c 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/package-info.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/package-info.java
@@ -31,8 +31,8 @@
})
package org.optaplanner.benchmark.config;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ranking/SolverRankingType.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ranking/SolverRankingType.java
index 45c0e09dc7..79a3e3b1ce 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ranking/SolverRankingType.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ranking/SolverRankingType.java
@@ -19,7 +19,7 @@
package org.optaplanner.benchmark.config.ranking;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.benchmark.impl.ranking.TotalRankSolverRankingWeightFactory;
import org.optaplanner.benchmark.impl.ranking.TotalScoreSolverRankingComparator;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ranking/package-info.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ranking/package-info.java
index 1436d7af51..ad7e291334 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ranking/package-info.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/ranking/package-info.java
@@ -23,7 +23,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.benchmark.config.ranking;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.benchmark.config.PlannerBenchmarkConfig;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/report/BenchmarkReportConfig.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/report/BenchmarkReportConfig.java
index 594351a82d..e74fe952be 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/report/BenchmarkReportConfig.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/report/BenchmarkReportConfig.java
@@ -23,8 +23,8 @@ import java.util.Comparator;
import java.util.Locale;
import java.util.function.Consumer;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.optaplanner.benchmark.config.ranking.SolverRankingType;
import org.optaplanner.benchmark.impl.ranking.SolverRankingWeightFactory;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/report/package-info.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/report/package-info.java
index 11001431f0..6742fd8283 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/report/package-info.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/report/package-info.java
@@ -23,7 +23,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.benchmark.config.report;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.benchmark.config.PlannerBenchmarkConfig;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/ProblemStatisticType.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/ProblemStatisticType.java
index 43f43012e9..3787adcf1c 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/ProblemStatisticType.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/ProblemStatisticType.java
@@ -21,7 +21,7 @@ package org.optaplanner.benchmark.config.statistic;
import java.util.List;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.benchmark.impl.result.ProblemBenchmarkResult;
import org.optaplanner.benchmark.impl.statistic.ProblemStatistic;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/SingleStatisticType.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/SingleStatisticType.java
index 619b6d8c7f..aecc77ce0d 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/SingleStatisticType.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/SingleStatisticType.java
@@ -19,7 +19,7 @@
package org.optaplanner.benchmark.config.statistic;
-import javax.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnum;
import org.optaplanner.benchmark.impl.report.ReportHelper;
import org.optaplanner.benchmark.impl.result.SubSingleBenchmarkResult;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/package-info.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/package-info.java
index 4ec856d5ed..209e559b93 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/package-info.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/config/statistic/package-info.java
@@ -23,7 +23,7 @@
elementFormDefault = XmlNsForm.QUALIFIED)
package org.optaplanner.benchmark.config.statistic;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
import org.optaplanner.benchmark.config.PlannerBenchmarkConfig;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/FileProblemProvider.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/FileProblemProvider.java
index 28c8be0b82..9e63b63474 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/FileProblemProvider.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/FileProblemProvider.java
@@ -21,7 +21,7 @@ package org.optaplanner.benchmark.impl.loader;
import java.io.File;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.optaplanner.benchmark.impl.result.SubSingleBenchmarkResult;
import org.optaplanner.persistence.common.api.domain.solution.SolutionFileIO;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/InstanceProblemProvider.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/InstanceProblemProvider.java
index 0f1f9374b3..6ff1ff0f09 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/InstanceProblemProvider.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/InstanceProblemProvider.java
@@ -21,7 +21,7 @@ package org.optaplanner.benchmark.impl.loader;
import java.util.Objects;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.optaplanner.benchmark.impl.result.SubSingleBenchmarkResult;
import org.optaplanner.core.api.domain.solution.cloner.SolutionCloner;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/ProblemProvider.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/ProblemProvider.java
index 583eb61298..d1e833b12c 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/ProblemProvider.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/loader/ProblemProvider.java
@@ -19,7 +19,7 @@
package org.optaplanner.benchmark.impl.loader;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
import org.optaplanner.benchmark.impl.result.SubSingleBenchmarkResult;
import org.optaplanner.core.api.domain.solution.PlanningSolution;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/PlannerBenchmarkResult.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/PlannerBenchmarkResult.java
index dc6374665c..366a920fec 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/PlannerBenchmarkResult.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/PlannerBenchmarkResult.java
@@ -32,9 +32,9 @@ import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.optaplanner.benchmark.impl.report.BenchmarkReport;
import org.optaplanner.core.api.score.Score;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/ProblemBenchmarkResult.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/ProblemBenchmarkResult.java
index dc81a09230..37217ae6ad 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/ProblemBenchmarkResult.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/ProblemBenchmarkResult.java
@@ -33,10 +33,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlIDREF;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.optaplanner.benchmark.config.statistic.ProblemStatisticType;
import org.optaplanner.benchmark.config.statistic.SingleStatisticType;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SingleBenchmarkResult.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SingleBenchmarkResult.java
index 649d09af68..9dba11998b 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SingleBenchmarkResult.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SingleBenchmarkResult.java
@@ -27,10 +27,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.optaplanner.benchmark.config.statistic.ProblemStatisticType;
import org.optaplanner.benchmark.impl.measurement.ScoreDifferencePercentage;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SolverBenchmarkResult.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SolverBenchmarkResult.java
index e22e935bfe..6503ecea5e 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SolverBenchmarkResult.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SolverBenchmarkResult.java
@@ -26,8 +26,8 @@ import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.optaplanner.benchmark.impl.measurement.ScoreDifferencePercentage;
import org.optaplanner.benchmark.impl.report.BenchmarkReport;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SubSingleBenchmarkResult.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SubSingleBenchmarkResult.java
index 09f6fe54b5..e477b85d63 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SubSingleBenchmarkResult.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/SubSingleBenchmarkResult.java
@@ -25,9 +25,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.optaplanner.benchmark.impl.report.BenchmarkReport;
import org.optaplanner.benchmark.impl.statistic.ProblemStatistic;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/package-info.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/package-info.java
index cb96188349..1aab049278 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/package-info.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/result/package-info.java
@@ -26,10 +26,10 @@ package org.optaplanner.benchmark.impl.result;
import java.time.OffsetDateTime;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.optaplanner.core.api.score.Score;
import org.optaplanner.core.impl.io.jaxb.adapter.JaxbOffsetDateTimeAdapter;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/ProblemStatistic.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/ProblemStatistic.java
index 3f385641a0..2ce0d4bc82 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/ProblemStatistic.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/ProblemStatistic.java
@@ -23,10 +23,10 @@ import java.io.File;
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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.jfree.chart.JFreeChart;
import org.optaplanner.benchmark.config.statistic.ProblemStatisticType;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/PureSubSingleStatistic.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/PureSubSingleStatistic.java
index ef05ee62e7..0c06d8c206 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/PureSubSingleStatistic.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/PureSubSingleStatistic.java
@@ -22,7 +22,7 @@ package org.optaplanner.benchmark.impl.statistic;
import java.io.File;
import java.util.List;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
import org.jfree.chart.JFreeChart;
import org.optaplanner.benchmark.config.statistic.SingleStatisticType;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/SubSingleStatistic.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/SubSingleStatistic.java
index dce08829a1..f30447d5b0 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/SubSingleStatistic.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/SubSingleStatistic.java
@@ -30,9 +30,9 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.optaplanner.benchmark.impl.report.ReportHelper;
import org.optaplanner.benchmark.impl.result.PlannerBenchmarkResult;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/constraintmatchtotalbestscore/ConstraintMatchTotalBestScoreSubSingleStatistic.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/constraintmatchtotalbestscore/ConstraintMatchTotalBestScoreSubSingleStatistic.java
index fdd1c74460..e5180d261d 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/constraintmatchtotalbestscore/ConstraintMatchTotalBestScoreSubSingleStatistic.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/constraintmatchtotalbestscore/ConstraintMatchTotalBestScoreSubSingleStatistic.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.axis.NumberAxis;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/constraintmatchtotalstepscore/ConstraintMatchTotalStepScoreSubSingleStatistic.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/constraintmatchtotalstepscore/ConstraintMatchTotalStepScoreSubSingleStatistic.java
index 57fb32e27f..93844fa20a 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/constraintmatchtotalstepscore/ConstraintMatchTotalStepScoreSubSingleStatistic.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/constraintmatchtotalstepscore/ConstraintMatchTotalStepScoreSubSingleStatistic.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.axis.NumberAxis;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/pickedmovetypebestscore/PickedMoveTypeBestScoreDiffSubSingleStatistic.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/pickedmovetypebestscore/PickedMoveTypeBestScoreDiffSubSingleStatistic.java
index 50433f71d9..e495e370a9 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/pickedmovetypebestscore/PickedMoveTypeBestScoreDiffSubSingleStatistic.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/pickedmovetypebestscore/PickedMoveTypeBestScoreDiffSubSingleStatistic.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.axis.NumberAxis;
diff --git a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/pickedmovetypestepscore/PickedMoveTypeStepScoreDiffSubSingleStatistic.java b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/pickedmovetypestepscore/PickedMoveTypeStepScoreDiffSubSingleStatistic.java
index 1d9f823a65..4998ce91c0 100644
--- a/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/pickedmovetypestepscore/PickedMoveTypeStepScoreDiffSubSingleStatistic.java
+++ b/optaplanner-benchmark/src/main/java/org/optaplanner/benchmark/impl/statistic/subsingle/pickedmovetypestepscore/PickedMoveTypeStepScoreDiffSubSingleStatistic.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.axis.NumberAxis;
diff --git a/optaplanner-benchmark/src/test/java/org/optaplanner/benchmark/impl/statistic/AbstractSubSingleStatisticTest.java b/optaplanner-benchmark/src/test/java/org/optaplanner/benchmark/impl/statistic/AbstractSubSingleStatisticTest.java
index 057a4bb754..5687d3da16 100644
--- a/optaplanner-benchmark/src/test/java/org/optaplanner/benchmark/impl/statistic/AbstractSubSingleStatisticTest.java
+++ b/optaplanner-benchmark/src/test/java/org/optaplanner/benchmark/impl/statistic/AbstractSubSingleStatisticTest.java
@@ -34,11 +34,12 @@ import java.util.List;
import java.util.UUID;
import java.util.function.Function;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
diff --git a/optaplanner-docs/pom.xml b/optaplanner-docs/pom.xml
index bfbd42db74..bf52fee8cb 100755
--- a/optaplanner-docs/pom.xml
+++ b/optaplanner-docs/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
diff --git a/optaplanner-examples/pom.xml b/optaplanner-examples/pom.xml
index c26ba11b23..d387f16f7b 100644
--- a/optaplanner-examples/pom.xml
+++ b/optaplanner-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
@@ -173,8 +173,8 @@
</dependency>
<!-- External dependencies -->
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.json</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>org.jfree</groupId>
diff --git a/optaplanner-examples/src/main/java/org/optaplanner/examples/conferencescheduling/persistence/ConferenceSchedulingCfpDevoxxImporter.java b/optaplanner-examples/src/main/java/org/optaplanner/examples/conferencescheduling/persistence/ConferenceSchedulingCfpDevoxxImporter.java
index 972a4aed45..371d7470b1 100644
--- a/optaplanner-examples/src/main/java/org/optaplanner/examples/conferencescheduling/persistence/ConferenceSchedulingCfpDevoxxImporter.java
+++ b/optaplanner-examples/src/main/java/org/optaplanner/examples/conferencescheduling/persistence/ConferenceSchedulingCfpDevoxxImporter.java
@@ -35,11 +35,11 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
import org.optaplanner.examples.common.util.Pair;
import org.optaplanner.examples.conferencescheduling.domain.ConferenceConstraintConfiguration;
diff --git a/optaplanner-migration/pom.xml b/optaplanner-migration/pom.xml
index 621528b7b4..acd5436603 100644
--- a/optaplanner-migration/pom.xml
+++ b/optaplanner-migration/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
diff --git a/optaplanner-operator/pom.xml b/optaplanner-operator/pom.xml
index 2416605d02..0a019bb5d0 100644
--- a/optaplanner-operator/pom.xml
+++ b/optaplanner-operator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,7 @@
<properties>
<java.module.name>org.optaplanner.operator</java.module.name>
<!-- Quarkus Ecosystem CI (and other CI possibly too) updates the version.io.quarkus property. -->
- <version.io.quarkus.override>2.15.0.Final</version.io.quarkus.override>
+ <version.io.quarkus.override>3.0.0.Final</version.io.quarkus.override>
</properties>
<!-- TODO: Remove when OptaPlanner no longer supports Quarkus 2.13 -->
diff --git a/optaplanner-operator/src/main/java/org/optaplanner/operator/impl/solver/OptaPlannerSolverReconciler.java b/optaplanner-operator/src/main/java/org/optaplanner/operator/impl/solver/OptaPlannerSolverReconciler.java
index 701471bb33..11b61cc73c 100644
--- a/optaplanner-operator/src/main/java/org/optaplanner/operator/impl/solver/OptaPlannerSolverReconciler.java
+++ b/optaplanner-operator/src/main/java/org/optaplanner/operator/impl/solver/OptaPlannerSolverReconciler.java
@@ -22,7 +22,7 @@ package org.optaplanner.operator.impl.solver;
import java.util.Map;
import java.util.Optional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.optaplanner.operator.impl.solver.model.ConfigMapDependentResource;
import org.optaplanner.operator.impl.solver.model.DeploymentDependentResource;
diff --git a/optaplanner-operator/src/test/java/org/optaplanner/operator/impl/solver/OptaPlannerSolverReconcilerTest.java b/optaplanner-operator/src/test/java/org/optaplanner/operator/impl/solver/OptaPlannerSolverReconcilerTest.java
index 81f5201ea1..83515d8376 100644
--- a/optaplanner-operator/src/test/java/org/optaplanner/operator/impl/solver/OptaPlannerSolverReconcilerTest.java
+++ b/optaplanner-operator/src/test/java/org/optaplanner/operator/impl/solver/OptaPlannerSolverReconcilerTest.java
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
import org.assertj.core.api.SoftAssertions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/optaplanner-persistence/optaplanner-persistence-common/pom.xml b/optaplanner-persistence/optaplanner-persistence-common/pom.xml
index 46b977d80a..88af2162d0 100644
--- a/optaplanner-persistence/optaplanner-persistence-common/pom.xml
+++ b/optaplanner-persistence/optaplanner-persistence-common/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-persistence-common</artifactId>
diff --git a/optaplanner-persistence/optaplanner-persistence-jackson/pom.xml b/optaplanner-persistence/optaplanner-persistence-jackson/pom.xml
index b460c0bb49..60460f331e 100644
--- a/optaplanner-persistence/optaplanner-persistence-jackson/pom.xml
+++ b/optaplanner-persistence/optaplanner-persistence-jackson/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-persistence-jackson</artifactId>
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/pom.xml b/optaplanner-persistence/optaplanner-persistence-jaxb/pom.xml
index 1ed9943063..a9fe9ad837 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/pom.xml
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-persistence-jaxb</artifactId>
@@ -78,8 +78,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.json</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
<scope>test</scope>
</dependency>
<!-- Testing -->
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/api/score/AbstractScoreJaxbAdapter.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/api/score/AbstractScoreJaxbAdapter.java
index 06b83dce83..ab0c5e8e80 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/api/score/AbstractScoreJaxbAdapter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/api/score/AbstractScoreJaxbAdapter.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jaxb.api.score;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.optaplanner.core.api.score.Score;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/api/score/PolymorphicScoreJaxbAdapter.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/api/score/PolymorphicScoreJaxbAdapter.java
index 8a18a82fc6..8f40eb0a94 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/api/score/PolymorphicScoreJaxbAdapter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/api/score/PolymorphicScoreJaxbAdapter.java
@@ -19,9 +19,9 @@
package org.optaplanner.persistence.jaxb.api.score;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.optaplanner.core.api.score.Score;
import org.optaplanner.core.api.score.buildin.bendable.BendableScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/impl/domain/solution/JaxbSolutionFileIO.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/impl/domain/solution/JaxbSolutionFileIO.java
index 51955c2b94..0de57b4469 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/impl/domain/solution/JaxbSolutionFileIO.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/main/java/org/optaplanner/persistence/jaxb/impl/domain/solution/JaxbSolutionFileIO.java
@@ -29,10 +29,10 @@ import java.io.Reader;
import java.io.Writer;
import java.util.Arrays;
-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 org.optaplanner.core.api.domain.solution.PlanningSolution;
import org.optaplanner.persistence.common.api.domain.solution.SolutionFileIO;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/AbstractScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/AbstractScoreJaxbAdapterTest.java
index db9aec8589..4b70bac3e7 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/AbstractScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/AbstractScoreJaxbAdapterTest.java
@@ -25,10 +25,10 @@ import static org.assertj.core.api.Assertions.fail;
import java.io.StringReader;
import java.io.StringWriter;
-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 org.optaplanner.core.api.score.Score;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/PolymorphicScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/PolymorphicScoreJaxbAdapterTest.java
index 0d8e82dcd8..db5e92c89b 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/PolymorphicScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/PolymorphicScoreJaxbAdapterTest.java
@@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.Score;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendable/BendableScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendable/BendableScoreJaxbAdapterTest.java
index acbce93436..915346e58c 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendable/BendableScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendable/BendableScoreJaxbAdapterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jaxb.api.score.buildin.bendable;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendable.BendableScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreJaxbAdapterTest.java
index 56446c079c..8d727bac76 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreJaxbAdapterTest.java
@@ -21,8 +21,8 @@ package org.optaplanner.persistence.jaxb.api.score.buildin.bendablebigdecimal;
import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendablebigdecimal.BendableBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendablelong/BendableLongScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendablelong/BendableLongScoreJaxbAdapterTest.java
index be622de046..a4933444d0 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendablelong/BendableLongScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/bendablelong/BendableLongScoreJaxbAdapterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jaxb.api.score.buildin.bendablelong;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendablelong.BendableLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoft/HardMediumSoftScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoft/HardMediumSoftScoreJaxbAdapterTest.java
index 7ef229ee2f..73978093dc 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoft/HardMediumSoftScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoft/HardMediumSoftScoreJaxbAdapterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jaxb.api.score.buildin.hardmediumsoft;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardmediumsoft.HardMediumSoftScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreJaxbAdapterTest.java
index 86246e1bee..655af950d8 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreJaxbAdapterTest.java
@@ -21,8 +21,8 @@ package org.optaplanner.persistence.jaxb.api.score.buildin.hardmediumsoftbigdeci
import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardmediumsoftbigdecimal.HardMediumSoftBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreJaxbAdapterTest.java
index 31eebf8a0a..59e897c01b 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreJaxbAdapterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jaxb.api.score.buildin.hardmediumsoftlong;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardmediumsoftlong.HardMediumSoftLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoft/HardSoftScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoft/HardSoftScoreJaxbAdapterTest.java
index bb090e542d..b50089deb2 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoft/HardSoftScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoft/HardSoftScoreJaxbAdapterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jaxb.api.score.buildin.hardsoft;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreJaxbAdapterTest.java
index b391e32d5c..621868a7b8 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreJaxbAdapterTest.java
@@ -21,8 +21,8 @@ package org.optaplanner.persistence.jaxb.api.score.buildin.hardsoftbigdecimal;
import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardsoftbigdecimal.HardSoftBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoftlong/HardSoftLongScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoftlong/HardSoftLongScoreJaxbAdapterTest.java
index 9e7c238445..71257a4c55 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoftlong/HardSoftLongScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/hardsoftlong/HardSoftLongScoreJaxbAdapterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jaxb.api.score.buildin.hardsoftlong;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardsoftlong.HardSoftLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simple/SimpleScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simple/SimpleScoreJaxbAdapterTest.java
index d21240f8dc..ec7f9fb013 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simple/SimpleScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simple/SimpleScoreJaxbAdapterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jaxb.api.score.buildin.simple;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.simple.SimpleScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreJaxbAdapterTest.java
index bfe1f2930e..2f05e512c9 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreJaxbAdapterTest.java
@@ -21,8 +21,8 @@ package org.optaplanner.persistence.jaxb.api.score.buildin.simplebigdecimal;
import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.simplebigdecimal.SimpleBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simplelong/SimpleLongScoreJaxbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simplelong/SimpleLongScoreJaxbAdapterTest.java
index 2ceb9c675c..bf23d9a204 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simplelong/SimpleLongScoreJaxbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/api/score/buildin/simplelong/SimpleLongScoreJaxbAdapterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jaxb.api.score.buildin.simplelong;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.simplelong.SimpleLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataEntity.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataEntity.java
index 6b629d9f97..b7f117a7c7 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataEntity.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataEntity.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jaxb.impl.testdata.domain;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlIDREF;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.optaplanner.core.api.domain.entity.PlanningEntity;
import org.optaplanner.core.api.domain.variable.PlanningVariable;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataObject.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataObject.java
index f0c51dc8e7..704a226415 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataObject.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataObject.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jaxb.impl.testdata.domain;
-import javax.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlID;
import org.optaplanner.core.impl.testdata.util.CodeAssertable;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataSolution.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataSolution.java
index 8537a8b3d6..04c17d3eb0 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataSolution.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataSolution.java
@@ -21,10 +21,10 @@ package org.optaplanner.persistence.jaxb.impl.testdata.domain;
import java.util.List;
-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.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.optaplanner.core.api.domain.solution.PlanningEntityCollectionProperty;
import org.optaplanner.core.api.domain.solution.PlanningScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataValue.java b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataValue.java
index 37f5419b6a..1acd4a2bcf 100644
--- a/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataValue.java
+++ b/optaplanner-persistence/optaplanner-persistence-jaxb/src/test/java/org/optaplanner/persistence/jaxb/impl/testdata/domain/JaxbTestdataValue.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jaxb.impl.testdata.domain;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class JaxbTestdataValue extends JaxbTestdataObject {
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml b/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml
index 6df2d9e38c..58709cec56 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-persistence-jpa</artifactId>
@@ -62,29 +62,6 @@
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <exclusions>
- <!-- Duplicates classes of jakarta.activation:jakarta.activation-api -->
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- </exclusion>
- <!-- Duplicates classes of jakarta.xml.bind:jakarta.xml.bind-api -->
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <!-- TODO: remove once the hibernate-core switches to jakarta.transaction:jakarta.transaction-api. -->
- <exclusion>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.2_spec</artifactId>
- </exclusion>
- </exclusions>
- <!-- Used at compile time by *ScoreHibernateType -->
- <optional>true</optional>
- </dependency>
<!-- Testing -->
<dependency>
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendable/BendableScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendable/BendableScoreConverter.java
index 793f808e18..a99fd3a4e0 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendable/BendableScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendable/BendableScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.bendable;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.bendable.BendableScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreConverter.java
index 54a7b062aa..9d639784ad 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.bendablebigdecimal;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.bendablebigdecimal.BendableBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablelong/BendableLongScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablelong/BendableLongScoreConverter.java
index bce4603578..91c76a5c1d 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablelong/BendableLongScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablelong/BendableLongScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.bendablelong;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.bendablelong.BendableLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoft/HardMediumSoftScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoft/HardMediumSoftScoreConverter.java
index 6f1ae9c3d3..5dbe5de5dc 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoft/HardMediumSoftScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoft/HardMediumSoftScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardmediumsoft;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.hardmediumsoft.HardMediumSoftScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreConverter.java
index 56056b0a64..f0e5f68ab4 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardmediumsoftbigdecimal;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.hardmediumsoftbigdecimal.HardMediumSoftBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreConverter.java
index fc9ee60ef8..ce3304c7e9 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardmediumsoftlong;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.hardmediumsoftlong.HardMediumSoftLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoft/HardSoftScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoft/HardSoftScoreConverter.java
index 8eaba7d1c4..a49ef4747b 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoft/HardSoftScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoft/HardSoftScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardsoft;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreConverter.java
index a1f08b9758..5ab62d36db 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardsoftbigdecimal;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.hardsoftbigdecimal.HardSoftBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftlong/HardSoftLongScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftlong/HardSoftLongScoreConverter.java
index 9cf94d2572..ec8fab0219 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftlong/HardSoftLongScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftlong/HardSoftLongScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardsoftlong;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.hardsoftlong.HardSoftLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simple/SimpleScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simple/SimpleScoreConverter.java
index 8a4dee5147..081c673c6a 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simple/SimpleScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simple/SimpleScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.simple;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.simple.SimpleScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreConverter.java
index dfa6bbc64c..f5e7fa96a9 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.simplebigdecimal;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.simplebigdecimal.SimpleBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simplelong/SimpleLongScoreConverter.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simplelong/SimpleLongScoreConverter.java
index a8f4736603..afe2f7d58b 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simplelong/SimpleLongScoreConverter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/api/score/buildin/simplelong/SimpleLongScoreConverter.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.simplelong;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.optaplanner.core.api.score.buildin.simplelong.SimpleLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/AbstractScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/AbstractScoreHibernateType.java
deleted file mode 100644
index 5fd6e1531a..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/AbstractScoreHibernateType.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Properties;
-
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.type.AbstractSingleColumnStandardBasicType;
-import org.hibernate.type.BigDecimalType;
-import org.hibernate.type.DoubleType;
-import org.hibernate.type.IntegerType;
-import org.hibernate.type.LongType;
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.type.Type;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.api.score.Score;
-import org.optaplanner.core.impl.score.definition.ScoreDefinition;
-
-/**
- * This class is Hibernate specific, because JPA 2.1's @Converter currently
- * cannot handle 1 class mapping to multiple SQL columns.
- *
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.domain.solution.PlanningScore} with Hibernate 6,
- * either use the score converters in the <code>org.optaplanner.persistence.jpa.api.score.buildin</code>
- * package or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public abstract class AbstractScoreHibernateType implements CompositeUserType {
-
- protected ScoreDefinition scoreDefinition;
- protected AbstractSingleColumnStandardBasicType type;
-
- protected int extractIntParameter(Properties parameterMap, String parameterName) {
- String valueString = (String) parameterMap.get(parameterName);
- if (valueString == null) {
- throw new IllegalArgumentException("The parameter " + parameterName + " (" + valueString
- + ") is missing for " + getClass().getSimpleName() + ".");
- }
- try {
- return Integer.parseInt(valueString);
- } catch (NumberFormatException e) {
- throw new IllegalArgumentException("The parameter " + parameterName + " (" + valueString
- + ") is not a valid integer for " + getClass().getSimpleName() + ".");
- }
- }
-
- @Override
- public Class returnedClass() {
- return scoreDefinition.getScoreClass();
- }
-
- @Override
- public String[] getPropertyNames() {
- int levelsSize = scoreDefinition.getLevelsSize();
- String[] propertyNames = new String[levelsSize + 1];
- propertyNames[0] = scoreDefinition.getInitLabel();
- String[] levelLabels = scoreDefinition.getLevelLabels();
- for (int i = 0; i < levelsSize; i++) {
- String propertyName = levelLabels[i].replaceAll("\\s+s", "S").replaceAll("\\s+(\\d)", "$1");
- if (!propertyName.matches("[\\w\\d]+")) {
- throw new IllegalStateException("The levelLabel (" + levelLabels[i] + ") is not yet supported.");
- }
- propertyNames[i + 1] = propertyName;
- }
- return propertyNames;
- }
-
- @Override
- public Type[] getPropertyTypes() {
- int levelsSize = scoreDefinition.getLevelsSize();
- Type[] propertyTypes = new Type[levelsSize + 1];
- propertyTypes[0] = StandardBasicTypes.INTEGER;
- for (int i = 0; i < levelsSize; i++) {
- propertyTypes[i + 1] = type;
- }
- return propertyTypes;
- }
-
- @Override
- public Object getPropertyValue(Object o, int propertyIndex) {
- if (o == null) {
- return null;
- }
- Score score = (Score) o;
- if (propertyIndex == 0) {
- return score.initScore();
- }
- if (propertyIndex >= scoreDefinition.getLevelsSize() + 1) {
- throw new IllegalArgumentException("The propertyIndex (" + propertyIndex
- + ") must be lower than the levelsSize for score (" + score + ").");
- }
- Number[] levelNumbers = score.toLevelNumbers();
- return levelNumbers[propertyIndex - 1];
- }
-
- @Override
- public Score nullSafeGet(ResultSet resultSet, String[] names, SharedSessionContractImplementor session, Object owner)
- throws SQLException {
- if (resultSet == null) {
- return null;
- }
- int nullCount = 0;
- Integer initScore = (Integer) StandardBasicTypes.INTEGER.nullSafeGet(resultSet, names[0], session, owner);
- if (initScore == null) {
- nullCount++;
- }
- int levelsSize = scoreDefinition.getLevelsSize();
- Number[] levelNumbers = new Number[levelsSize];
- for (int i = 0; i < levelsSize; i++) {
- Number levelNumber = (Number) type.nullSafeGet(resultSet, names[i + 1], session, owner);
- if (levelNumber == null) {
- nullCount++;
- } else {
- levelNumbers[i] = levelNumber;
- }
- }
- if (nullCount == levelsSize + 1) {
- return null;
- } else if (nullCount != 0) {
- throw new IllegalStateException("The nullCount (" + nullCount
- + ") must be 0 or levelsSize (" + levelsSize + ") for " + getClass().getSimpleName() + ".");
- }
- Score score = scoreDefinition.fromLevelNumbers(initScore, levelNumbers);
- if (score == null) {
- throw new IllegalStateException("The levelNumbers (" + Arrays.toString(levelNumbers)
- + ") must not build a score (" + null + ") that is null.");
- }
- return score;
- }
-
- @Override
- public void nullSafeSet(PreparedStatement statement, Object value, int parameterIndex,
- SharedSessionContractImplementor session)
- throws SQLException {
- int levelsSize = scoreDefinition.getLevelsSize();
- if (value == null) {
- statement.setNull(parameterIndex, StandardBasicTypes.INTEGER.sqlType()); // initScore
- for (int i = 0; i < levelsSize; i++) {
- statement.setNull(parameterIndex + i + 1, type.sqlType());
- }
- return;
- }
- Score score = (Score) value;
- statement.setInt(parameterIndex, score.initScore());
- Number[] levelNumbers = score.toLevelNumbers();
- if (levelNumbers.length != levelsSize) {
- throw new IllegalStateException("The levelNumbers length (" + levelNumbers.length + ") for score (" + score
- + ") must be equal to the levelsSize (" + levelsSize + ") for " + getClass().getSimpleName() + ".");
- }
- for (int i = 0; i < levelsSize; i++) {
- if (type == IntegerType.INSTANCE) {
- statement.setInt(parameterIndex + i + 1, (Integer) levelNumbers[i]);
- } else if (type == LongType.INSTANCE) {
- statement.setLong(parameterIndex + i + 1, (Long) levelNumbers[i]);
- } else if (type == DoubleType.INSTANCE) {
- statement.setDouble(parameterIndex + i + 1, (Double) levelNumbers[i]);
- } else if (type == BigDecimalType.INSTANCE) {
- statement.setBigDecimal(parameterIndex + i + 1, (BigDecimal) levelNumbers[i]);
- } else {
- throw new IllegalStateException("The type (" + type + ") is not yet supported.");
- }
- }
- }
-
- // ************************************************************************
- // Mutable related methods
- // ************************************************************************
-
- @Override
- public boolean isMutable() {
- return false;
- }
-
- @Override
- public Object deepCopy(Object value) {
- return value; // Score is immutable
- }
-
- @Override
- public Object replace(Object original, Object target, SharedSessionContractImplementor session, Object owner) {
- return original; // Score is immutable
- }
-
- @Override
- public void setPropertyValue(Object component, int property, Object value) {
- throw new UnsupportedOperationException("A Score is immutable.");
- }
-
- // ************************************************************************
- // Other methods
- // ************************************************************************
-
- @Override
- public boolean equals(Object a, Object b) {
- if (a == b) {
- return true;
- } else if (a == null || b == null) {
- return false;
- }
- return a.equals(b);
- }
-
- @Override
- public int hashCode(Object o) {
- if (o == null) {
- return 0;
- }
- return o.hashCode();
- }
-
- @Override
- public Serializable disassemble(Object value, SharedSessionContractImplementor session) {
- return (Serializable) value;
- }
-
- @Override
- public Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner) {
- return cached;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendable/BendableScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendable/BendableScoreHibernateType.java
deleted file mode 100644
index da17d36549..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendable/BendableScoreHibernateType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.bendable;
-
-import java.util.Properties;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.hibernate.usertype.ParameterizedType;
-import org.optaplanner.core.impl.score.buildin.BendableScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.bendable.BendableScore} with Hibernate 6,
- * either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.bendable.BendableScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class BendableScoreHibernateType extends AbstractScoreHibernateType implements ParameterizedType {
-
- @Override
- public void setParameterValues(Properties parameterMap) {
- int hardLevelsSize = extractIntParameter(parameterMap, "hardLevelsSize");
- int softLevelsSize = extractIntParameter(parameterMap, "softLevelsSize");
- scoreDefinition = new BendableScoreDefinition(hardLevelsSize, softLevelsSize);
- type = StandardBasicTypes.INTEGER;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHibernateType.java
deleted file mode 100644
index b25f2395dc..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHibernateType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.bendablebigdecimal;
-
-import java.util.Properties;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.hibernate.usertype.ParameterizedType;
-import org.optaplanner.core.impl.score.buildin.BendableBigDecimalScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.bendablebigdecimal.BendableBigDecimalScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.bendablebigdecimal.BendableBigDecimalScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class BendableBigDecimalScoreHibernateType extends AbstractScoreHibernateType implements ParameterizedType {
-
- @Override
- public void setParameterValues(Properties parameterMap) {
- int hardLevelsSize = extractIntParameter(parameterMap, "hardLevelsSize");
- int softLevelsSize = extractIntParameter(parameterMap, "softLevelsSize");
- scoreDefinition = new BendableBigDecimalScoreDefinition(hardLevelsSize, softLevelsSize);
- type = StandardBasicTypes.BIG_DECIMAL;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablelong/BendableLongScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablelong/BendableLongScoreHibernateType.java
deleted file mode 100644
index de7b7be3dc..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablelong/BendableLongScoreHibernateType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.bendablelong;
-
-import java.util.Properties;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.hibernate.usertype.ParameterizedType;
-import org.optaplanner.core.impl.score.buildin.BendableLongScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.bendablelong.BendableLongScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.bendablelong.BendableLongScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-public class BendableLongScoreHibernateType extends AbstractScoreHibernateType implements ParameterizedType {
-
- @Override
- public void setParameterValues(Properties parameterMap) {
- int hardLevelsSize = extractIntParameter(parameterMap, "hardLevelsSize");
- int softLevelsSize = extractIntParameter(parameterMap, "softLevelsSize");
- scoreDefinition = new BendableLongScoreDefinition(hardLevelsSize, softLevelsSize);
- type = StandardBasicTypes.LONG;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoft/HardMediumSoftScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoft/HardMediumSoftScoreHibernateType.java
deleted file mode 100644
index 17ed0640ab..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoft/HardMediumSoftScoreHibernateType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardmediumsoft;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.impl.score.buildin.HardMediumSoftScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.hardmediumsoft.HardMediumSoftScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.hardmediumsoft.HardMediumSoftScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class HardMediumSoftScoreHibernateType extends AbstractScoreHibernateType {
-
- public HardMediumSoftScoreHibernateType() {
- scoreDefinition = new HardMediumSoftScoreDefinition();
- type = StandardBasicTypes.INTEGER;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreHibernateType.java
deleted file mode 100644
index 3504830c4b..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreHibernateType.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardmediumsoftbigdecimal;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.impl.score.buildin.HardMediumSoftBigDecimalScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the
- * {@link org.optaplanner.core.api.score.buildin.hardmediumsoftbigdecimal.HardMediumSoftBigDecimalScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.hardmediumsoftbigdecimal.HardMediumSoftBigDecimalScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class HardMediumSoftBigDecimalScoreHibernateType extends AbstractScoreHibernateType {
-
- public HardMediumSoftBigDecimalScoreHibernateType() {
- scoreDefinition = new HardMediumSoftBigDecimalScoreDefinition();
- type = StandardBasicTypes.BIG_DECIMAL;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreHibernateType.java
deleted file mode 100644
index 47b88ae727..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreHibernateType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardmediumsoftlong;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.impl.score.buildin.HardMediumSoftLongScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.hardmediumsoftlong.HardMediumSoftLongScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.hardmediumsoftlong.HardMediumSoftLongScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class HardMediumSoftLongScoreHibernateType extends AbstractScoreHibernateType {
-
- public HardMediumSoftLongScoreHibernateType() {
- scoreDefinition = new HardMediumSoftLongScoreDefinition();
- type = StandardBasicTypes.LONG;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoft/HardSoftScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoft/HardSoftScoreHibernateType.java
deleted file mode 100644
index 131b8c10db..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoft/HardSoftScoreHibernateType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardsoft;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.impl.score.buildin.HardSoftScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.hardsoft.HardSoftScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class HardSoftScoreHibernateType extends AbstractScoreHibernateType {
-
- public HardSoftScoreHibernateType() {
- scoreDefinition = new HardSoftScoreDefinition();
- type = StandardBasicTypes.INTEGER;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreHibernateType.java
deleted file mode 100644
index fe4ddbf5e4..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreHibernateType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardsoftbigdecimal;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.impl.score.buildin.HardSoftBigDecimalScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.hardsoftbigdecimal.HardSoftBigDecimalScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.hardsoftbigdecimal.HardSoftBigDecimalScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class HardSoftBigDecimalScoreHibernateType extends AbstractScoreHibernateType {
-
- public HardSoftBigDecimalScoreHibernateType() {
- scoreDefinition = new HardSoftBigDecimalScoreDefinition();
- type = StandardBasicTypes.BIG_DECIMAL;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftlong/HardSoftLongScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftlong/HardSoftLongScoreHibernateType.java
deleted file mode 100644
index 4261415edb..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftlong/HardSoftLongScoreHibernateType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardsoftlong;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.impl.score.buildin.HardSoftLongScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.hardsoftlong.HardSoftLongScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.hardsoftlong.HardSoftLongScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class HardSoftLongScoreHibernateType extends AbstractScoreHibernateType {
-
- public HardSoftLongScoreHibernateType() {
- scoreDefinition = new HardSoftLongScoreDefinition();
- type = StandardBasicTypes.LONG;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simple/SimpleScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simple/SimpleScoreHibernateType.java
deleted file mode 100644
index 15475e1beb..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simple/SimpleScoreHibernateType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.simple;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.impl.score.buildin.SimpleScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.simple.SimpleScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.simple.SimpleScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class SimpleScoreHibernateType extends AbstractScoreHibernateType {
-
- public SimpleScoreHibernateType() {
- scoreDefinition = new SimpleScoreDefinition();
- type = StandardBasicTypes.INTEGER;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplebigdecimal/SimpleBigDecimalScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplebigdecimal/SimpleBigDecimalScoreHibernateType.java
deleted file mode 100644
index 8b25399014..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplebigdecimal/SimpleBigDecimalScoreHibernateType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.simplebigdecimal;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.impl.score.buildin.SimpleBigDecimalScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.simplebigdecimal.SimpleBigDecimalScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.simplebigdecimal.SimpleBigDecimalScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class SimpleBigDecimalScoreHibernateType extends AbstractScoreHibernateType {
-
- public SimpleBigDecimalScoreHibernateType() {
- scoreDefinition = new SimpleBigDecimalScoreDefinition();
- type = StandardBasicTypes.BIG_DECIMAL;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplelong/SimpleLongScoreHibernateType.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplelong/SimpleLongScoreHibernateType.java
deleted file mode 100644
index 459146a4f1..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplelong/SimpleLongScoreHibernateType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.simplelong;
-
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.usertype.CompositeUserType;
-import org.optaplanner.core.impl.score.buildin.SimpleLongScoreDefinition;
-import org.optaplanner.persistence.jpa.impl.score.AbstractScoreHibernateType;
-
-/**
- * @deprecated This class has been deprecated as the Hibernate 6 does not provide full backward compatibility
- * for the {@link CompositeUserType}.
- * The class will remain available in the OptaPlanner 8 releases to provide
- * integration with Hibernate 5 but will be removed in OptaPlanner 9.
- * To integrate the {@link org.optaplanner.core.api.score.buildin.simplelong.SimpleLongScore}
- * with Hibernate 6, either use the score converter
- * {@link org.optaplanner.persistence.jpa.api.score.buildin.simplelong.SimpleLongScoreConverter})
- * or implement the {@link CompositeUserType} yourself.
- */
-@Deprecated(forRemoval = true)
-public class SimpleLongScoreHibernateType extends AbstractScoreHibernateType {
-
- public SimpleLongScoreHibernateType() {
- scoreDefinition = new SimpleLongScoreDefinition();
- type = StandardBasicTypes.LONG;
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendable/BendableScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendable/BendableScoreConverterTest.java
index 5e64d50b82..ab52fd5290 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendable/BendableScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendable/BendableScoreConverterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.bendable;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendable.BendableScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreConverterTest.java
index 1500d78f1f..c47cef4567 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreConverterTest.java
@@ -21,8 +21,8 @@ package org.optaplanner.persistence.jpa.api.score.buildin.bendablebigdecimal;
import java.math.BigDecimal;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendablebigdecimal.BendableBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablelong/BendableLongScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablelong/BendableLongScoreConverterTest.java
index ff8d42aee2..238fa3c0c7 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablelong/BendableLongScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/bendablelong/BendableLongScoreConverterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.bendablelong;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendablelong.BendableLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoft/HardMediumSoftScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoft/HardMediumSoftScoreConverterTest.java
index 25b3c1625b..fc59d06583 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoft/HardMediumSoftScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoft/HardMediumSoftScoreConverterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardmediumsoft;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardmediumsoft.HardMediumSoftScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreConverterTest.java
index 38c2413f6d..be165b4e2f 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreConverterTest.java
@@ -21,8 +21,8 @@ package org.optaplanner.persistence.jpa.api.score.buildin.hardmediumsoftbigdecim
import java.math.BigDecimal;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardmediumsoftbigdecimal.HardMediumSoftBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreConverterTest.java
index a7b50e0761..9e095caa1f 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreConverterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardmediumsoftlong;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardmediumsoftlong.HardMediumSoftLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoft/HardSoftScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoft/HardSoftScoreConverterTest.java
index 72523480c4..5d83847efa 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoft/HardSoftScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoft/HardSoftScoreConverterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardsoft;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreConverterTest.java
index 0d7df67b59..0f896f7dc9 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreConverterTest.java
@@ -21,8 +21,8 @@ package org.optaplanner.persistence.jpa.api.score.buildin.hardsoftbigdecimal;
import java.math.BigDecimal;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardsoftbigdecimal.HardSoftBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftlong/HardSoftLongScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftlong/HardSoftLongScoreConverterTest.java
index 745f129595..1a6bb07df0 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftlong/HardSoftLongScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/hardsoftlong/HardSoftLongScoreConverterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.hardsoftlong;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardsoftlong.HardSoftLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simple/SimpleScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simple/SimpleScoreConverterTest.java
index 43c50c01b1..4f00e96e93 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simple/SimpleScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simple/SimpleScoreConverterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.simple;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.simple.SimpleScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreConverterTest.java
index dc25bb36ff..64f361c3f4 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreConverterTest.java
@@ -21,8 +21,8 @@ package org.optaplanner.persistence.jpa.api.score.buildin.simplebigdecimal;
import java.math.BigDecimal;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.simplebigdecimal.SimpleBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simplelong/SimpleLongScoreConverterTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simplelong/SimpleLongScoreConverterTest.java
index 301fbdbad1..920595b0a2 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simplelong/SimpleLongScoreConverterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/api/score/buildin/simplelong/SimpleLongScoreConverterTest.java
@@ -19,8 +19,8 @@
package org.optaplanner.persistence.jpa.api.score.buildin.simplelong;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.simplelong.SimpleLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/AbstractScoreJpaTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/AbstractScoreJpaTest.java
index 86735fe545..d41bd3f619 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/AbstractScoreJpaTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/AbstractScoreJpaTest.java
@@ -21,13 +21,13 @@ package org.optaplanner.persistence.jpa.impl;
import static org.assertj.core.api.Assertions.assertThat;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
import org.optaplanner.core.api.score.Score;
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendable/BendableScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendable/BendableScoreHibernateTypeTest.java
deleted file mode 100644
index 22776c1328..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendable/BendableScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.bendable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.bendable.BendableScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class BendableScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new BendableScoreHibernateTypeTestJpaEntity(BendableScore.zero(3, 2)),
- BendableScore.of(new int[] { 10000, 2000, 300 }, new int[] { 40, 5 }),
- BendableScore.ofUninitialized(-7, new int[] { 10000, 2000, 300 }, new int[] { 40, 5 }));
- }
-
- @Entity
- @TypeDef(defaultForType = BendableScore.class, typeClass = BendableScoreHibernateType.class, parameters = {
- @Parameter(name = "hardLevelsSize", value = "3"), @Parameter(name = "softLevelsSize", value = "2") })
- static class BendableScoreHibernateTypeTestJpaEntity extends AbstractTestJpaEntity<BendableScore> {
-
- @Columns(columns = { @Column(name = "initScore"),
- @Column(name = "hard0Score"), @Column(name = "hard1Score"), @Column(name = "hard2Score"),
- @Column(name = "soft0Score"), @Column(name = "soft1Score") })
- protected BendableScore score;
-
- BendableScoreHibernateTypeTestJpaEntity() {
- }
-
- public BendableScoreHibernateTypeTestJpaEntity(BendableScore score) {
- this.score = score;
- }
-
- @Override
- public BendableScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(BendableScore score) {
- this.score = score;
- }
- }
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHibernateTypeTest.java
deleted file mode 100644
index 08b455a71f..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.bendablebigdecimal;
-
-import java.math.BigDecimal;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.bendablebigdecimal.BendableBigDecimalScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class BendableBigDecimalScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new BendableBigDecimalScoreHibernateTypeTestJpaEntity(BendableBigDecimalScore.zero(3, 2)),
- BendableBigDecimalScore.of(
- new BigDecimal[] { new BigDecimal("10000.00001"), new BigDecimal("2000.00020"),
- new BigDecimal("300.00300") },
- new BigDecimal[] { new BigDecimal("40.04000"), new BigDecimal("5.50000") }),
- BendableBigDecimalScore.ofUninitialized(-7,
- new BigDecimal[] { new BigDecimal("10000.00001"), new BigDecimal("2000.00020"),
- new BigDecimal("300.00300") },
- new BigDecimal[] { new BigDecimal("40.04000"), new BigDecimal("5.50000") }));
- }
-
- @Entity
- @TypeDef(defaultForType = BendableBigDecimalScore.class, typeClass = BendableBigDecimalScoreHibernateType.class,
- parameters = {
- @Parameter(name = "hardLevelsSize", value = "3"), @Parameter(name = "softLevelsSize", value = "2") })
- static class BendableBigDecimalScoreHibernateTypeTestJpaEntity extends AbstractTestJpaEntity<BendableBigDecimalScore> {
-
- @Columns(columns = {
- @Column(name = "initScore"),
- @Column(name = "hard0Score", precision = 10, scale = 5),
- @Column(name = "hard1Score", precision = 10, scale = 5),
- @Column(name = "hard2Score", precision = 10, scale = 5),
- @Column(name = "soft0Score", precision = 10, scale = 5),
- @Column(name = "soft1Score", precision = 10, scale = 5) })
- protected BendableBigDecimalScore score;
-
- BendableBigDecimalScoreHibernateTypeTestJpaEntity() {
- }
-
- public BendableBigDecimalScoreHibernateTypeTestJpaEntity(BendableBigDecimalScore score) {
- this.score = score;
- }
-
- @Override
- public BendableBigDecimalScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(BendableBigDecimalScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablelong/BendableLongScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablelong/BendableLongScoreHibernateTypeTest.java
deleted file mode 100644
index 204377e4c1..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablelong/BendableLongScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.bendablelong;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.bendablelong.BendableLongScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class BendableLongScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new BendableLongScoreHibernateTypeTestJpaEntity(BendableLongScore.zero(3, 2)),
- BendableLongScore.of(new long[] { 10000L, 2000L, 300L }, new long[] { 40L, 5L }),
- BendableLongScore.ofUninitialized(-7, new long[] { 10000L, 2000L, 300L }, new long[] { 40L, 5L }));
- }
-
- @Entity
- @TypeDef(defaultForType = BendableLongScore.class, typeClass = BendableLongScoreHibernateType.class, parameters = {
- @Parameter(name = "hardLevelsSize", value = "3"), @Parameter(name = "softLevelsSize", value = "2") })
- static class BendableLongScoreHibernateTypeTestJpaEntity extends AbstractTestJpaEntity<BendableLongScore> {
-
- @Columns(columns = { @Column(name = "initScore"),
- @Column(name = "hard0Score"), @Column(name = "hard1Score"), @Column(name = "hard2Score"),
- @Column(name = "soft0Score"), @Column(name = "soft1Score") })
- protected BendableLongScore score;
-
- BendableLongScoreHibernateTypeTestJpaEntity() {
- }
-
- public BendableLongScoreHibernateTypeTestJpaEntity(BendableLongScore score) {
- this.score = score;
- }
-
- @Override
- public BendableLongScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(BendableLongScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoft/HardMediumSoftScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoft/HardMediumSoftScoreHibernateTypeTest.java
deleted file mode 100644
index 8b919464af..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoft/HardMediumSoftScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardmediumsoft;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.hardmediumsoft.HardMediumSoftScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class HardMediumSoftScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new HardMediumSoftScoreHibernateTypeTestJpaEntity(HardMediumSoftScore.ZERO),
- HardMediumSoftScore.of(-100, -20, -3),
- HardMediumSoftScore.ofUninitialized(-7, -100, -20, -3));
- }
-
- @Entity
- @TypeDef(defaultForType = HardMediumSoftScore.class, typeClass = HardMediumSoftScoreHibernateType.class)
- static class HardMediumSoftScoreHibernateTypeTestJpaEntity extends AbstractTestJpaEntity<HardMediumSoftScore> {
-
- @Columns(columns = { @Column(name = "initScore"),
- @Column(name = "hardScore"), @Column(name = "mediumScore"), @Column(name = "softScore") })
- protected HardMediumSoftScore score;
-
- HardMediumSoftScoreHibernateTypeTestJpaEntity() {
- }
-
- public HardMediumSoftScoreHibernateTypeTestJpaEntity(HardMediumSoftScore score) {
- this.score = score;
- }
-
- @Override
- public HardMediumSoftScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(HardMediumSoftScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreHibernateTypeTest.java
deleted file mode 100644
index f8d7b92352..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardmediumsoftbigdecimal;
-
-import java.math.BigDecimal;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.hardmediumsoftbigdecimal.HardMediumSoftBigDecimalScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class HardMediumSoftBigDecimalScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new HardMediumSoftBigDecimalScoreHibernateTypeTestJpaEntity(HardMediumSoftBigDecimalScore.ZERO),
- HardMediumSoftBigDecimalScore.of(new BigDecimal("-10.01000"), new BigDecimal("-4.32100"),
- new BigDecimal("-2.20000")),
- HardMediumSoftBigDecimalScore.ofUninitialized(-7, new BigDecimal("-10.01000"), new BigDecimal("-4.32100"),
- new BigDecimal("-2.20000")));
- }
-
- @Entity
- @TypeDef(defaultForType = HardMediumSoftBigDecimalScore.class, typeClass = HardMediumSoftBigDecimalScoreHibernateType.class)
- static class HardMediumSoftBigDecimalScoreHibernateTypeTestJpaEntity
- extends AbstractTestJpaEntity<HardMediumSoftBigDecimalScore> {
-
- @Columns(columns = {
- @Column(name = "initScore"),
- @Column(name = "hardScore", precision = 10, scale = 5),
- @Column(name = "mediumScore", precision = 10, scale = 5),
- @Column(name = "softScore", precision = 10, scale = 5) })
- protected HardMediumSoftBigDecimalScore score;
-
- HardMediumSoftBigDecimalScoreHibernateTypeTestJpaEntity() {
- }
-
- public HardMediumSoftBigDecimalScoreHibernateTypeTestJpaEntity(HardMediumSoftBigDecimalScore score) {
- this.score = score;
- }
-
- @Override
- public HardMediumSoftBigDecimalScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(HardMediumSoftBigDecimalScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreHibernateTypeTest.java
deleted file mode 100644
index 34048c7fdd..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardmediumsoftlong;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.hardmediumsoftlong.HardMediumSoftLongScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class HardMediumSoftLongScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new HardMediumSoftLongScoreHibernateTypeTestJpaEntity(HardMediumSoftLongScore.ZERO),
- HardMediumSoftLongScore.of(-100L, -20L, -3L),
- HardMediumSoftLongScore.ofUninitialized(-7, -100L, -20L, -3L));
- }
-
- @Entity
- @TypeDef(defaultForType = HardMediumSoftLongScore.class, typeClass = HardMediumSoftLongScoreHibernateType.class)
- static class HardMediumSoftLongScoreHibernateTypeTestJpaEntity
- extends AbstractTestJpaEntity<HardMediumSoftLongScore> {
-
- @Columns(columns = { @Column(name = "initScore"),
- @Column(name = "hardScore"), @Column(name = "mediumScore"), @Column(name = "softScore") })
- protected HardMediumSoftLongScore score;
-
- HardMediumSoftLongScoreHibernateTypeTestJpaEntity() {
- }
-
- public HardMediumSoftLongScoreHibernateTypeTestJpaEntity(HardMediumSoftLongScore score) {
- this.score = score;
- }
-
- @Override
- public HardMediumSoftLongScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(HardMediumSoftLongScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoft/HardSoftScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoft/HardSoftScoreHibernateTypeTest.java
deleted file mode 100644
index de30fb51ba..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoft/HardSoftScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardsoft;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class HardSoftScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new HardSoftScoreHibernateTypeTestJpaEntity(HardSoftScore.ZERO),
- HardSoftScore.of(-10, -2),
- HardSoftScore.ofUninitialized(-7, -10, -2));
- }
-
- @Entity
- @TypeDef(defaultForType = HardSoftScore.class, typeClass = HardSoftScoreHibernateType.class)
- static class HardSoftScoreHibernateTypeTestJpaEntity extends AbstractTestJpaEntity<HardSoftScore> {
-
- @Columns(columns = { @Column(name = "initScore"), @Column(name = "hardScore"), @Column(name = "softScore") })
- protected HardSoftScore score;
-
- HardSoftScoreHibernateTypeTestJpaEntity() {
- }
-
- public HardSoftScoreHibernateTypeTestJpaEntity(HardSoftScore score) {
- this.score = score;
- }
-
- @Override
- public HardSoftScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(HardSoftScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreHibernateTypeTest.java
deleted file mode 100644
index 4694288e8c..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardsoftbigdecimal;
-
-import java.math.BigDecimal;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.hardsoftbigdecimal.HardSoftBigDecimalScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class HardSoftBigDecimalScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new HardSoftBigDecimalScoreHibernateTypeTestJpaEntity(HardSoftBigDecimalScore.ZERO),
- HardSoftBigDecimalScore.of(new BigDecimal("-10.01000"), new BigDecimal("-2.20000")),
- HardSoftBigDecimalScore.ofUninitialized(-7, new BigDecimal("-10.01000"), new BigDecimal("-2.20000")));
- }
-
- @Entity
- @TypeDef(defaultForType = HardSoftBigDecimalScore.class, typeClass = HardSoftBigDecimalScoreHibernateType.class)
- static class HardSoftBigDecimalScoreHibernateTypeTestJpaEntity
- extends AbstractTestJpaEntity<HardSoftBigDecimalScore> {
-
- @Columns(columns = {
- @Column(name = "initScore"),
- @Column(name = "hardScore", precision = 10, scale = 5),
- @Column(name = "softScore", precision = 10, scale = 5) })
- protected HardSoftBigDecimalScore score;
-
- HardSoftBigDecimalScoreHibernateTypeTestJpaEntity() {
- }
-
- public HardSoftBigDecimalScoreHibernateTypeTestJpaEntity(HardSoftBigDecimalScore score) {
- this.score = score;
- }
-
- @Override
- public HardSoftBigDecimalScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(HardSoftBigDecimalScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftlong/HardSoftLongScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftlong/HardSoftLongScoreHibernateTypeTest.java
deleted file mode 100644
index 373d654567..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftlong/HardSoftLongScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.hardsoftlong;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.hardsoftlong.HardSoftLongScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class HardSoftLongScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new HardSoftLongScoreHibernateTypeTestJpaEntity(HardSoftLongScore.ZERO),
- HardSoftLongScore.of(-10L, -2L),
- HardSoftLongScore.ofUninitialized(-7, -10L, -2L));
- }
-
- @Entity
- @TypeDef(defaultForType = HardSoftLongScore.class, typeClass = HardSoftLongScoreHibernateType.class)
- static class HardSoftLongScoreHibernateTypeTestJpaEntity extends AbstractTestJpaEntity<HardSoftLongScore> {
-
- @Columns(columns = { @Column(name = "initScore"), @Column(name = "hardScore"), @Column(name = "softScore") })
- protected HardSoftLongScore score;
-
- HardSoftLongScoreHibernateTypeTestJpaEntity() {
- }
-
- public HardSoftLongScoreHibernateTypeTestJpaEntity(HardSoftLongScore score) {
- this.score = score;
- }
-
- @Override
- public HardSoftLongScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(HardSoftLongScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simple/SimpleScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simple/SimpleScoreHibernateTypeTest.java
deleted file mode 100644
index 512bddd38f..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simple/SimpleScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.simple;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.simple.SimpleScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class SimpleScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new SimpleScoreHibernateTypeTestJpaEntity(SimpleScore.ZERO),
- SimpleScore.of(-10),
- SimpleScore.ofUninitialized(-7, -10));
- }
-
- @Entity
- @TypeDef(defaultForType = SimpleScore.class, typeClass = SimpleScoreHibernateType.class)
- static class SimpleScoreHibernateTypeTestJpaEntity extends AbstractTestJpaEntity<SimpleScore> {
-
- @Columns(columns = { @Column(name = "initScore"), @Column(name = "score") })
- protected SimpleScore score;
-
- SimpleScoreHibernateTypeTestJpaEntity() {
- }
-
- public SimpleScoreHibernateTypeTestJpaEntity(SimpleScore score) {
- this.score = score;
- }
-
- @Override
- public SimpleScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(SimpleScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplebigdecimal/SimpleBigDecimalScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplebigdecimal/SimpleBigDecimalScoreHibernateTypeTest.java
deleted file mode 100644
index 519c87417b..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplebigdecimal/SimpleBigDecimalScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.simplebigdecimal;
-
-import java.math.BigDecimal;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.simplebigdecimal.SimpleBigDecimalScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class SimpleBigDecimalScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new SimpleBigDecimalScoreHibernateTypeTestJpaEntity(SimpleBigDecimalScore.ZERO),
- SimpleBigDecimalScore.of(new BigDecimal("-10.01000")),
- SimpleBigDecimalScore.ofUninitialized(-7, new BigDecimal("-10.01000")));
- }
-
- @Entity
- @TypeDef(defaultForType = SimpleBigDecimalScore.class, typeClass = SimpleBigDecimalScoreHibernateType.class)
- static class SimpleBigDecimalScoreHibernateTypeTestJpaEntity extends AbstractTestJpaEntity<SimpleBigDecimalScore> {
-
- @Columns(columns = { @Column(name = "initScore"), @Column(name = "score", precision = 10, scale = 5) })
- protected SimpleBigDecimalScore score;
-
- SimpleBigDecimalScoreHibernateTypeTestJpaEntity() {
- }
-
- public SimpleBigDecimalScoreHibernateTypeTestJpaEntity(SimpleBigDecimalScore score) {
- this.score = score;
- }
-
- @Override
- public SimpleBigDecimalScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(SimpleBigDecimalScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplelong/SimpleLongScoreHibernateTypeTest.java b/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplelong/SimpleLongScoreHibernateTypeTest.java
deleted file mode 100644
index 0af855ae4d..0000000000
--- a/optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplelong/SimpleLongScoreHibernateTypeTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.optaplanner.persistence.jpa.impl.score.buildin.simplelong;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.annotations.TypeDef;
-import org.junit.jupiter.api.Test;
-import org.optaplanner.core.api.score.buildin.simplelong.SimpleLongScore;
-import org.optaplanner.persistence.jpa.impl.AbstractScoreJpaTest;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class SimpleLongScoreHibernateTypeTest extends AbstractScoreJpaTest {
-
- @Test
- void persistAndMerge() {
- persistAndMerge(new SimpleLongScoreHibernateTypeTestJpaEntity(SimpleLongScore.ZERO),
- SimpleLongScore.of(-10L),
- SimpleLongScore.ofUninitialized(-7, -10L));
- }
-
- @Entity
- @TypeDef(defaultForType = SimpleLongScore.class, typeClass = SimpleLongScoreHibernateType.class)
- static class SimpleLongScoreHibernateTypeTestJpaEntity extends AbstractTestJpaEntity<SimpleLongScore> {
-
- @Columns(columns = { @Column(name = "initScore"), @Column(name = "score") })
- protected SimpleLongScore score;
-
- SimpleLongScoreHibernateTypeTestJpaEntity() {
- }
-
- public SimpleLongScoreHibernateTypeTestJpaEntity(SimpleLongScore score) {
- this.score = score;
- }
-
- @Override
- public SimpleLongScore getScore() {
- return score;
- }
-
- @Override
- public void setScore(SimpleLongScore score) {
- this.score = score;
- }
-
- }
-
-}
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/pom.xml b/optaplanner-persistence/optaplanner-persistence-jsonb/pom.xml
index c827656bd4..56d54c23d0 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/pom.xml
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-persistence-jsonb</artifactId>
@@ -69,24 +69,14 @@
<artifactId>jakarta.json.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.json</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>jakarta.json</groupId>
- <artifactId>jakarta.json-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.json</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Testing -->
<dependency>
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/main/java/org/optaplanner/persistence/jsonb/api/OptaPlannerJsonbConfig.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/main/java/org/optaplanner/persistence/jsonb/api/OptaPlannerJsonbConfig.java
index f995458c5e..16523afa53 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/main/java/org/optaplanner/persistence/jsonb/api/OptaPlannerJsonbConfig.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/main/java/org/optaplanner/persistence/jsonb/api/OptaPlannerJsonbConfig.java
@@ -19,10 +19,10 @@
package org.optaplanner.persistence.jsonb.api;
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
-import javax.json.bind.adapter.JsonbAdapter;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
+import jakarta.json.bind.adapter.JsonbAdapter;
import org.optaplanner.persistence.jsonb.api.score.buildin.bendable.BendableScoreJsonbAdapter;
import org.optaplanner.persistence.jsonb.api.score.buildin.bendablebigdecimal.BendableBigDecimalScoreJsonbAdapter;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/main/java/org/optaplanner/persistence/jsonb/api/score/AbstractScoreJsonbAdapter.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/main/java/org/optaplanner/persistence/jsonb/api/score/AbstractScoreJsonbAdapter.java
index 2c4a17bdda..5795a58e8d 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/main/java/org/optaplanner/persistence/jsonb/api/score/AbstractScoreJsonbAdapter.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/main/java/org/optaplanner/persistence/jsonb/api/score/AbstractScoreJsonbAdapter.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jsonb.api.score;
-import javax.json.bind.adapter.JsonbAdapter;
+import jakarta.json.bind.adapter.JsonbAdapter;
import org.optaplanner.core.api.score.Score;
import org.optaplanner.persistence.jsonb.api.OptaPlannerJsonbConfig;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/AbstractJsonbJsonAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/AbstractJsonbJsonAdapterTest.java
index 067d8bccf8..b48543be7e 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/AbstractJsonbJsonAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/AbstractJsonbJsonAdapterTest.java
@@ -19,9 +19,9 @@
package org.optaplanner.persistence.jsonb.api;
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbException;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbException;
public abstract class AbstractJsonbJsonAdapterTest {
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/OptaPlannerJsonbConfigTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/OptaPlannerJsonbConfigTest.java
index 0c09ea09de..ea43d9d500 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/OptaPlannerJsonbConfigTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/OptaPlannerJsonbConfigTest.java
@@ -21,9 +21,9 @@ package org.optaplanner.persistence.jsonb.api;
import static org.assertj.core.api.Assertions.assertThat;
-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.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendable.BendableScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/AbstractScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/AbstractScoreJsonbAdapterTest.java
index cd9a110b30..e29b726886 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/AbstractScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/AbstractScoreJsonbAdapterTest.java
@@ -22,9 +22,9 @@ package org.optaplanner.persistence.jsonb.api.score;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbException;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbException;
import org.optaplanner.core.api.score.Score;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendable/BendableScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendable/BendableScoreJsonbAdapterTest.java
index e6d5c3e88d..ac00edcc20 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendable/BendableScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendable/BendableScoreJsonbAdapterTest.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jsonb.api.score.buildin.bendable;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendable.BendableScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreJsonbAdapterTest.java
index 64d44b2e87..cc44da968f 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreJsonbAdapterTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.persistence.jsonb.api.score.buildin.bendablebigdecimal;
import java.math.BigDecimal;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendablebigdecimal.BendableBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendablelong/BendableLongScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendablelong/BendableLongScoreJsonbAdapterTest.java
index 3788d996cc..a44165b0b1 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendablelong/BendableLongScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/bendablelong/BendableLongScoreJsonbAdapterTest.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jsonb.api.score.buildin.bendablelong;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.bendablelong.BendableLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoft/HardMediumSoftScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoft/HardMediumSoftScoreJsonbAdapterTest.java
index fc4363e61d..e4e0897f30 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoft/HardMediumSoftScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoft/HardMediumSoftScoreJsonbAdapterTest.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jsonb.api.score.buildin.hardmediumsoft;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardmediumsoft.HardMediumSoftScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreJsonbAdapterTest.java
index 46e377ab2b..2c7774ff16 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreJsonbAdapterTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.persistence.jsonb.api.score.buildin.hardmediumsoftbigdec
import java.math.BigDecimal;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardmediumsoftbigdecimal.HardMediumSoftBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreJsonbAdapterTest.java
index 711c3e0118..8622ce1da7 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreJsonbAdapterTest.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jsonb.api.score.buildin.hardmediumsoftlong;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardmediumsoftlong.HardMediumSoftLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoft/HardSoftScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoft/HardSoftScoreJsonbAdapterTest.java
index 96d1818c59..cadaf7ef16 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoft/HardSoftScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoft/HardSoftScoreJsonbAdapterTest.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jsonb.api.score.buildin.hardsoft;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreJsonbAdapterTest.java
index f40175b10a..78d8827e58 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreJsonbAdapterTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.persistence.jsonb.api.score.buildin.hardsoftbigdecimal;
import java.math.BigDecimal;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardsoftbigdecimal.HardSoftBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoftlong/HardSoftLongScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoftlong/HardSoftLongScoreJsonbAdapterTest.java
index 8a68d7de2e..54693c6d14 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoftlong/HardSoftLongScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/hardsoftlong/HardSoftLongScoreJsonbAdapterTest.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jsonb.api.score.buildin.hardsoftlong;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.hardsoftlong.HardSoftLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simple/SimpleScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simple/SimpleScoreJsonbAdapterTest.java
index af966636fd..c009b214d7 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simple/SimpleScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simple/SimpleScoreJsonbAdapterTest.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jsonb.api.score.buildin.simple;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.simple.SimpleScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreJsonbAdapterTest.java
index 1cb70bb6eb..26d1331596 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simplebigdecimal/SimpleBigDecimalScoreJsonbAdapterTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.persistence.jsonb.api.score.buildin.simplebigdecimal;
import java.math.BigDecimal;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.simplebigdecimal.SimpleBigDecimalScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simplelong/SimpleLongScoreJsonbAdapterTest.java b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simplelong/SimpleLongScoreJsonbAdapterTest.java
index 2779c1e58d..3fd4ee56fc 100644
--- a/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simplelong/SimpleLongScoreJsonbAdapterTest.java
+++ b/optaplanner-persistence/optaplanner-persistence-jsonb/src/test/java/org/optaplanner/persistence/jsonb/api/score/buildin/simplelong/SimpleLongScoreJsonbAdapterTest.java
@@ -19,7 +19,7 @@
package org.optaplanner.persistence.jsonb.api.score.buildin.simplelong;
-import javax.json.bind.annotation.JsonbTypeAdapter;
+import jakarta.json.bind.annotation.JsonbTypeAdapter;
import org.junit.jupiter.api.Test;
import org.optaplanner.core.api.score.buildin.simplelong.SimpleLongScore;
diff --git a/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml b/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml
index f1ce039cf4..a79c288bd6 100644
--- a/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml
+++ b/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-persistence-xstream</artifactId>
diff --git a/optaplanner-persistence/pom.xml b/optaplanner-persistence/pom.xml
index 1057fb9cb6..7f8a58f5a8 100644
--- a/optaplanner-persistence/pom.xml
+++ b/optaplanner-persistence/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml
index 1f7108f730..2cd93c65d0 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-benchmark-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-benchmark-deployment</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorBenchmarkConfigTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorBenchmarkConfigTest.java
index a812d2aa5a..e24c1663b4 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorBenchmarkConfigTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorBenchmarkConfigTest.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorInheritedSolverBenchmarkTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorInheritedSolverBenchmarkTest.java
index 2132b8f957..20a86f9cac 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorInheritedSolverBenchmarkTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorInheritedSolverBenchmarkTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.benchmark.quarkus;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorNoBenchmarkConfigTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorNoBenchmarkConfigTest.java
index f437ed9acb..10a74f0ef8 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorNoBenchmarkConfigTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorNoBenchmarkConfigTest.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorOnlySolverConfigTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorOnlySolverConfigTest.java
index 20d7f788db..8b030c8c7b 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorOnlySolverConfigTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorOnlySolverConfigTest.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorPhasesTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorPhasesTest.java
index c9256e9b6b..27d8aec431 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorPhasesTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorPhasesTest.java
@@ -19,7 +19,7 @@
package org.optaplanner.benchmark.quarkus;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorSpentLimitConfiguredPerBenchmarkTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorSpentLimitConfiguredPerBenchmarkTest.java
index e37dbfab8a..08e3b655d4 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorSpentLimitConfiguredPerBenchmarkTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/src/test/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkProcessorSpentLimitConfiguredPerBenchmarkTest.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/pom.xml
index c7be99e465..b6228aa03b 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-benchmark-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-benchmark-integration-test</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/src/main/java/org/optaplanner/quarkus/benchmark/it/OptaPlannerBenchmarkTestResource.java b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/src/main/java/org/optaplanner/quarkus/benchmark/it/OptaPlannerBenchmarkTestResource.java
index d8810c70ae..875a7bc82a 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/src/main/java/org/optaplanner/quarkus/benchmark/it/OptaPlannerBenchmarkTestResource.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/src/main/java/org/optaplanner/quarkus/benchmark/it/OptaPlannerBenchmarkTestResource.java
@@ -21,11 +21,11 @@ package org.optaplanner.quarkus.benchmark.it;
import java.util.Arrays;
-import javax.inject.Inject;
-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.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.optaplanner.benchmark.api.PlannerBenchmark;
import org.optaplanner.benchmark.api.PlannerBenchmarkFactory;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/pom.xml
index 7f00749de8..9a1ec26d18 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-integration</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/pom.xml
index 81b38d8c11..3701cf54f3 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-benchmark-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-benchmark</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/src/main/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkBeanProvider.java b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/src/main/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkBeanProvider.java
index 2679e055aa..db9484972f 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/src/main/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkBeanProvider.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/src/main/java/org/optaplanner/benchmark/quarkus/OptaPlannerBenchmarkBeanProvider.java
@@ -19,8 +19,8 @@
package org.optaplanner.benchmark.quarkus;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
import org.optaplanner.benchmark.api.PlannerBenchmarkFactory;
import org.optaplanner.benchmark.config.PlannerBenchmarkConfig;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/src/main/java/org/optaplanner/benchmark/quarkus/UnavailableOptaPlannerBenchmarkBeanProvider.java b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/src/main/java/org/optaplanner/benchmark/quarkus/UnavailableOptaPlannerBenchmarkBeanProvider.java
index f8c289728d..2b36c2e73e 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/src/main/java/org/optaplanner/benchmark/quarkus/UnavailableOptaPlannerBenchmarkBeanProvider.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/src/main/java/org/optaplanner/benchmark/quarkus/UnavailableOptaPlannerBenchmarkBeanProvider.java
@@ -19,8 +19,8 @@
package org.optaplanner.benchmark.quarkus;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
import org.optaplanner.benchmark.api.PlannerBenchmarkFactory;
import org.optaplanner.core.api.domain.entity.PlanningEntity;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/deployment/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/deployment/pom.xml
index 8437cfe3db..4f1cf4509f 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/deployment/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/deployment/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-jackson-deployment</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/pom.xml
index 1686b7dc2c..a7d2712737 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-jackson-integration-test</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/src/main/java/org/optaplanner/quarkus/jackson/it/OptaPlannerTestResource.java b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/src/main/java/org/optaplanner/quarkus/jackson/it/OptaPlannerTestResource.java
index 1558e9595a..40cc77ecd7 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/src/main/java/org/optaplanner/quarkus/jackson/it/OptaPlannerTestResource.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/src/main/java/org/optaplanner/quarkus/jackson/it/OptaPlannerTestResource.java
@@ -21,9 +21,9 @@ package org.optaplanner.quarkus.jackson.it;
import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
import org.optaplanner.core.api.solver.SolverJob;
import org.optaplanner.core.api.solver.SolverManager;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/pom.xml
index 2799b5e5d4..ae57ec2198 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-integration</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-jackson-parent</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/pom.xml
index 25ece58700..46eda6f1ed 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-jackson</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/src/main/java/org/optaplanner/quarkus/jackson/OptaPlannerObjectMapperCustomizer.java b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/src/main/java/org/optaplanner/quarkus/jackson/OptaPlannerObjectMapperCustomizer.java
index 784c23177c..c1165fe090 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/src/main/java/org/optaplanner/quarkus/jackson/OptaPlannerObjectMapperCustomizer.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/src/main/java/org/optaplanner/quarkus/jackson/OptaPlannerObjectMapperCustomizer.java
@@ -19,7 +19,7 @@
package org.optaplanner.quarkus.jackson;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/deployment/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/deployment/pom.xml
index 0bd27698db..5444c1a2b8 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/deployment/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/deployment/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-jsonb-deployment</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/pom.xml
index 08c409be77..9d59f1556d 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-jsonb-integration-test</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/src/main/java/org/optaplanner/quarkus/jsonb/it/OptaPlannerTestResource.java b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/src/main/java/org/optaplanner/quarkus/jsonb/it/OptaPlannerTestResource.java
index 2d92261a5b..66fcd17ec0 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/src/main/java/org/optaplanner/quarkus/jsonb/it/OptaPlannerTestResource.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/src/main/java/org/optaplanner/quarkus/jsonb/it/OptaPlannerTestResource.java
@@ -21,9 +21,9 @@ package org.optaplanner.quarkus.jsonb.it;
import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
import org.optaplanner.core.api.solver.SolverJob;
import org.optaplanner.core.api.solver.SolverManager;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/pom.xml
index 5feee42f43..0c41630a83 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-integration</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-jsonb-parent</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/pom.xml
index dcf5afd35e..a91626f21b 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-jsonb</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/src/main/java/org/optaplanner/quarkus/jsonb/OptaPlannerJsonbConfigCustomizer.java b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/src/main/java/org/optaplanner/quarkus/jsonb/OptaPlannerJsonbConfigCustomizer.java
index 982e37a3a9..60ddd5a9c8 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/src/main/java/org/optaplanner/quarkus/jsonb/OptaPlannerJsonbConfigCustomizer.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/src/main/java/org/optaplanner/quarkus/jsonb/OptaPlannerJsonbConfigCustomizer.java
@@ -19,8 +19,8 @@
package org.optaplanner.quarkus.jsonb;
-import javax.inject.Singleton;
-import javax.json.bind.JsonbConfig;
+import jakarta.inject.Singleton;
+import jakarta.json.bind.JsonbConfig;
import org.optaplanner.core.api.score.Score;
import org.optaplanner.persistence.jsonb.api.OptaPlannerJsonbConfig;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml
index 1d47e98df5..4e2e251764 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-deployment</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/main/java/org/optaplanner/quarkus/deployment/GizmoMemberAccessorEntityEnhancer.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/main/java/org/optaplanner/quarkus/deployment/GizmoMemberAccessorEntityEnhancer.java
index d463a254d8..37234d6c81 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/main/java/org/optaplanner/quarkus/deployment/GizmoMemberAccessorEntityEnhancer.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/main/java/org/optaplanner/quarkus/deployment/GizmoMemberAccessorEntityEnhancer.java
@@ -45,7 +45,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.ClassInfo;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/main/java/org/optaplanner/quarkus/deployment/OptaPlannerProcessor.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/main/java/org/optaplanner/quarkus/deployment/OptaPlannerProcessor.java
index 345979f46e..1a98bbbad8 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/main/java/org/optaplanner/quarkus/deployment/OptaPlannerProcessor.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/main/java/org/optaplanner/quarkus/deployment/OptaPlannerProcessor.java
@@ -35,7 +35,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorChainedXMLNoneTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorChainedXMLNoneTest.java
index 532ab5d861..73bd318ec4 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorChainedXMLNoneTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorChainedXMLNoneTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.quarkus;
import static org.assertj.core.api.Assertions.assertThat;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorExtendedSolutionSolveTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorExtendedSolutionSolveTest.java
index 25910abc52..914a7c43dd 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorExtendedSolutionSolveTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorExtendedSolutionSolveTest.java
@@ -28,7 +28,7 @@ import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorGeneratedGizmoSupplierTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorGeneratedGizmoSupplierTest.java
index 227fbd8514..45c126ebce 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorGeneratedGizmoSupplierTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorGeneratedGizmoSupplierTest.java
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Random;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorGizmoKitchenSinkTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorGizmoKitchenSinkTest.java
index 905f992992..1a1fa901e4 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorGizmoKitchenSinkTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorGizmoKitchenSinkTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import java.util.Collections;
import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorInterfaceEntityTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorInterfaceEntityTest.java
index 6c4596e705..b14b1192cb 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorInterfaceEntityTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorInterfaceEntityTest.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorInvalidTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorInvalidTest.java
index 89ac962884..0dd8671142 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorInvalidTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorInvalidTest.java
@@ -22,7 +22,7 @@ package org.optaplanner.quarkus;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOnlyMultiConstructorTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOnlyMultiConstructorTest.java
index 58e8e6e59c..c4cc27087c 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOnlyMultiConstructorTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOnlyMultiConstructorTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.quarkus;
import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOverridePropertiesAtRuntimeTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOverridePropertiesAtRuntimeTest.java
index b4338bd29f..5f2686eaf1 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOverridePropertiesAtRuntimeTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOverridePropertiesAtRuntimeTest.java
@@ -27,11 +27,11 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorPlanningIdTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorPlanningIdTest.java
index 90cd312f88..6c3d85b022 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorPlanningIdTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorPlanningIdTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorPrivateConstructorTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorPrivateConstructorTest.java
index 078c80dc13..ef99e87275 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorPrivateConstructorTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorPrivateConstructorTest.java
@@ -22,7 +22,7 @@ package org.optaplanner.quarkus;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolveTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolveTest.java
index c6631ef00d..7efb75b7d7 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolveTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolveTest.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolverPropertiesBavetTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolverPropertiesBavetTest.java
index a33476ff62..5d72e3406a 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolverPropertiesBavetTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolverPropertiesBavetTest.java
@@ -22,7 +22,7 @@ package org.optaplanner.quarkus;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolverPropertiesTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolverPropertiesTest.java
index 56c3235468..ff7d19798e 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolverPropertiesTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorSolverPropertiesTest.java
@@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.time.Duration;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLDefaultTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLDefaultTest.java
index 08966ea95d..93e2ebd537 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLDefaultTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLDefaultTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Collections;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLNoneTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLNoneTest.java
index 44cc4ef541..1d7b39dc33 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLNoneTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLNoneTest.java
@@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.Collections;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLPropertyTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLPropertyTest.java
index 7a2ef02ee7..a10e8a726a 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLPropertyTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorXMLPropertyTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Collections;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintProviderTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintProviderTest.java
index 662b680f38..3134006355 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintProviderTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintProviderTest.java
@@ -22,7 +22,7 @@ package org.optaplanner.quarkus.constraints;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintsDrlDefaultTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintsDrlDefaultTest.java
index d587c8c034..a5f26bf7cc 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintsDrlDefaultTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintsDrlDefaultTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Collections;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintsDrlTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintsDrlTest.java
index 3ec726a84d..57976f357a 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintsDrlTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/constraints/OptaPlannerProcessorConstraintsDrlTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Collections;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/rest/SolverConfigTestResource.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/rest/SolverConfigTestResource.java
index 7475ef5528..43aa514001 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/rest/SolverConfigTestResource.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/rest/SolverConfigTestResource.java
@@ -19,12 +19,12 @@
package org.optaplanner.quarkus.rest;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.optaplanner.core.config.solver.SolverConfig;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierBavetStreamImplTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierBavetStreamImplTest.java
index 22f22ffaf3..29c630625a 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierBavetStreamImplTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierBavetStreamImplTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.quarkus.verifier;
import java.util.Arrays;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierDroolsStreamImplTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierDroolsStreamImplTest.java
index db326a5698..24ed5dd939 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierDroolsStreamImplTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierDroolsStreamImplTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.quarkus.verifier;
import java.util.Arrays;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierTest.java b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierTest.java
index 46cf890d55..be26675593 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierTest.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/verifier/OptaPlannerConstraintVerifierTest.java
@@ -21,7 +21,7 @@ package org.optaplanner.quarkus.verifier;
import java.util.Arrays;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/pom.xml
index d69118e63b..486e83912d 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-devui-integration-test</artifactId>
@@ -37,7 +37,7 @@
<!-- Code of integration tests should not be a part of test coverage reports. -->
<sonar.coverage.exclusions>**/*</sonar.coverage.exclusions>
<!-- Quarkus 2 and 3 use different context roots. -->
- <dev.ui.root>/q/dev</dev.ui.root>
+ <dev.ui.root>/q/dev-v1</dev.ui.root>
</properties>
<dependencies>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/src/main/java/org/optaplanner/quarkus/it/devui/OptaPlannerTestResource.java b/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/src/main/java/org/optaplanner/quarkus/it/devui/OptaPlannerTestResource.java
index e871202b98..9b9e31d216 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/src/main/java/org/optaplanner/quarkus/it/devui/OptaPlannerTestResource.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/src/main/java/org/optaplanner/quarkus/it/devui/OptaPlannerTestResource.java
@@ -22,11 +22,11 @@ package org.optaplanner.quarkus.it.devui;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-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.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.optaplanner.core.api.solver.SolverJob;
import org.optaplanner.core.api.solver.SolverManager;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/pom.xml
index aeb318f947..4b1a6f35ca 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-drl-integration-test</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/src/main/java/org/optaplanner/quarkus/drl/it/OptaPlannerTestResource.java b/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/src/main/java/org/optaplanner/quarkus/drl/it/OptaPlannerTestResource.java
index e68d401d1c..afa0396e45 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/src/main/java/org/optaplanner/quarkus/drl/it/OptaPlannerTestResource.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/src/main/java/org/optaplanner/quarkus/drl/it/OptaPlannerTestResource.java
@@ -22,11 +22,11 @@ package org.optaplanner.quarkus.drl.it;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-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.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.optaplanner.core.api.solver.SolverJob;
import org.optaplanner.core.api.solver.SolverManager;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/pom.xml
index 2768f7cc1f..eb77475ce0 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-integration-test</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/src/main/java/org/optaplanner/quarkus/it/OptaPlannerTestResource.java b/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/src/main/java/org/optaplanner/quarkus/it/OptaPlannerTestResource.java
index f13ebc612a..c29356fa89 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/src/main/java/org/optaplanner/quarkus/it/OptaPlannerTestResource.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/src/main/java/org/optaplanner/quarkus/it/OptaPlannerTestResource.java
@@ -22,11 +22,11 @@ package org.optaplanner.quarkus.it;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-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.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.optaplanner.core.api.solver.SolverJob;
import org.optaplanner.core.api.solver.SolverManager;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus/pom.xml
index e8cd235cb2..9619e4ac92 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-integration</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-parent</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/pom.xml
index de8f71ae27..4f6006882c 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus-reflection-integration-test</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/src/main/java/org/optaplanner/quarkus/it/reflection/OptaPlannerTestResource.java b/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/src/main/java/org/optaplanner/quarkus/it/reflection/OptaPlannerTestResource.java
index 223ed3482c..bf8082f442 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/src/main/java/org/optaplanner/quarkus/it/reflection/OptaPlannerTestResource.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/src/main/java/org/optaplanner/quarkus/it/reflection/OptaPlannerTestResource.java
@@ -22,11 +22,11 @@ package org.optaplanner.quarkus.it.reflection;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-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.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.optaplanner.core.api.solver.SolverJob;
import org.optaplanner.core.api.solver.SolverManager;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/pom.xml
index 5558b0852e..4e3007081a 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-quarkus</artifactId>
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/bean/DefaultOptaPlannerBeanProvider.java b/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/bean/DefaultOptaPlannerBeanProvider.java
index f8e6d20ffd..a1c0daec57 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/bean/DefaultOptaPlannerBeanProvider.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/bean/DefaultOptaPlannerBeanProvider.java
@@ -19,9 +19,9 @@
package org.optaplanner.quarkus.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
import org.optaplanner.core.api.score.Score;
import org.optaplanner.core.api.score.ScoreManager;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/bean/UnavailableOptaPlannerBeanProvider.java b/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/bean/UnavailableOptaPlannerBeanProvider.java
index 7a5cb57881..52a009ef1a 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/bean/UnavailableOptaPlannerBeanProvider.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/bean/UnavailableOptaPlannerBeanProvider.java
@@ -19,8 +19,8 @@
package org.optaplanner.quarkus.bean;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
import org.optaplanner.core.api.domain.entity.PlanningEntity;
import org.optaplanner.core.api.domain.solution.PlanningSolution;
diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/nativeimage/Substitute_ConfigUtils.java b/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/nativeimage/Substitute_ConfigUtils.java
index 284ee3868d..c134982904 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/nativeimage/Substitute_ConfigUtils.java
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/src/main/java/org/optaplanner/quarkus/nativeimage/Substitute_ConfigUtils.java
@@ -21,7 +21,7 @@ package org.optaplanner.quarkus.nativeimage;
import java.util.function.Supplier;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.CDI;
import org.optaplanner.quarkus.gizmo.OptaPlannerGizmoBeanFactory;
diff --git a/optaplanner-quarkus-integration/pom.xml b/optaplanner-quarkus-integration/pom.xml
index 9cbb2a1eaf..b4f5d6b402 100644
--- a/optaplanner-quarkus-integration/pom.xml
+++ b/optaplanner-quarkus-integration/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
diff --git a/optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/pom.xml b/optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/pom.xml
index 6c12fb5110..829a6d0b5c 100644
--- a/optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/pom.xml
+++ b/optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-spring-integration</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-spring-boot-autoconfigure</artifactId>
diff --git a/optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index e49d545f19..0000000000
--- a/optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.optaplanner.spring.boot.autoconfigure.OptaPlannerAutoConfiguration,org.optaplanner.spring.boot.autoconfigure.OptaPlannerBenchmarkAutoConfiguration
diff --git a/optaplanner-spring-integration/optaplanner-spring-boot-starter/pom.xml b/optaplanner-spring-integration/optaplanner-spring-boot-starter/pom.xml
index d54fd6f412..88be7ea5b8 100644
--- a/optaplanner-spring-integration/optaplanner-spring-boot-starter/pom.xml
+++ b/optaplanner-spring-integration/optaplanner-spring-boot-starter/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-spring-integration</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
</parent>
<artifactId>optaplanner-spring-boot-starter</artifactId>
diff --git a/optaplanner-spring-integration/pom.xml b/optaplanner-spring-integration/pom.xml
index 78455a5367..85802affd5 100644
--- a/optaplanner-spring-integration/pom.xml
+++ b/optaplanner-spring-integration/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
diff --git a/optaplanner-test/pom.xml b/optaplanner-test/pom.xml
index 8add6e9cd8..c223dddcc1 100644
--- a/optaplanner-test/pom.xml
+++ b/optaplanner-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-build-parent</artifactId>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<relativePath>../build/optaplanner-build-parent/pom.xml</relativePath>
</parent>
@@ -91,6 +91,9 @@
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index c40be12b46..c6b275aeba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-parent</artifactId>
<packaging>pom</packaging>
- <version>8.45.0-SNAPSHOT</version>
+ <version>9.45.0-SNAPSHOT</version>
<name>OptaPlanner multiproject parent</name>
<description>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org