From a86d18aac0cd795272eca5c1705ca48e32d1f207 Mon Sep 17 00:00:00 2001 From: Luca Molteni Date: Mon, 4 Dec 2023 10:17:58 +0100 Subject: [PATCH 1/3] Migrate to OptaPlanner 9 --- build/optaplanner-bom/pom.xml | 2 +- build/optaplanner-build-parent/pom.xml | 16 +- .../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 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../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 +- .../core/config/AbstractConfig.java | 4 +- .../ConstructionHeuristicPhaseConfig.java | 6 +- .../ConstructionHeuristicType.java | 2 +- .../ConstructionHeuristicForagerConfig.java | 2 +- .../ConstructionHeuristicPickEarlyType.java | 2 +- .../decider/forager/package-info.java | 4 +- .../constructionheuristic/package-info.java | 4 +- .../placer/EntityPlacerConfig.java | 2 +- .../placer/PooledEntityPlacerConfig.java | 6 +- .../placer/QueuedEntityPlacerConfig.java | 6 +- .../placer/QueuedValuePlacerConfig.java | 6 +- .../placer/package-info.java | 4 +- .../ExhaustiveSearchPhaseConfig.java | 6 +- .../ExhaustiveSearchType.java | 2 +- .../exhaustivesearch/NodeExplorationType.java | 2 +- .../config/exhaustivesearch/package-info.java | 4 +- .../selector/common/SelectionCacheType.java | 2 +- .../selector/common/SelectionOrder.java | 2 +- .../decorator/SelectionSorterOrder.java | 2 +- .../common/decorator/package-info.java | 4 +- .../common/nearby/NearbySelectionConfig.java | 4 +- .../NearbySelectionDistributionType.java | 2 +- .../selector/common/nearby/package-info.java | 4 +- .../selector/common/package-info.java | 4 +- .../selector/entity/EntitySelectorConfig.java | 6 +- .../selector/entity/EntitySorterManner.java | 2 +- .../selector/entity/package-info.java | 4 +- .../entity/pillar/PillarSelectorConfig.java | 4 +- .../entity/pillar/SubPillarConfigPolicy.java | 2 +- .../selector/entity/pillar/package-info.java | 4 +- .../list/DestinationSelectorConfig.java | 4 +- .../selector/list/SubListSelectorConfig.java | 6 +- .../heuristic/selector/list/package-info.java | 4 +- .../selector/move/MoveSelectorConfig.java | 4 +- .../CartesianProductMoveSelectorConfig.java | 6 +- .../composite/UnionMoveSelectorConfig.java | 6 +- .../selector/move/composite/package-info.java | 4 +- .../factory/MoveIteratorFactoryConfig.java | 4 +- .../move/factory/MoveListFactoryConfig.java | 4 +- .../selector/move/factory/package-info.java | 4 +- .../AbstractPillarMoveSelectorConfig.java | 4 +- .../generic/ChangeMoveSelectorConfig.java | 4 +- .../PillarChangeMoveSelectorConfig.java | 4 +- .../generic/PillarSwapMoveSelectorConfig.java | 6 +- .../selector/move/generic/SubPillarType.java | 2 +- .../move/generic/SwapMoveSelectorConfig.java | 6 +- .../chained/KOptMoveSelectorConfig.java | 4 +- .../SubChainChangeMoveSelectorConfig.java | 4 +- .../SubChainSwapMoveSelectorConfig.java | 4 +- .../TailChainSwapMoveSelectorConfig.java | 4 +- .../move/generic/chained/package-info.java | 4 +- .../list/ListChangeMoveSelectorConfig.java | 4 +- .../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 +- .../move/generic/list/package-info.java | 4 +- .../selector/move/generic/package-info.java | 4 +- .../heuristic/selector/move/package-info.java | 4 +- .../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 +- .../selector/value/package-info.java | 4 +- .../localsearch/LocalSearchPhaseConfig.java | 6 +- .../config/localsearch/LocalSearchType.java | 2 +- .../decider/acceptor/AcceptorType.java | 2 +- .../acceptor/LocalSearchAcceptorConfig.java | 4 +- .../decider/acceptor/package-info.java | 4 +- .../StepCountingHillClimbingType.java | 2 +- .../package-info.java | 4 +- .../decider/forager/FinalistPodiumType.java | 2 +- .../forager/LocalSearchForagerConfig.java | 2 +- .../forager/LocalSearchPickEarlyType.java | 2 +- .../decider/forager/package-info.java | 4 +- .../core/config/localsearch/package-info.java | 4 +- .../optaplanner/core/config/package-info.java | 4 +- .../PartitionedSearchPhaseConfig.java | 8 +- .../partitionedsearch/package-info.java | 4 +- .../core/config/phase/PhaseConfig.java | 6 +- .../phase/custom/CustomPhaseConfig.java | 8 +- .../config/phase/custom/package-info.java | 4 +- .../core/config/phase/package-info.java | 4 +- .../score/definition/ScoreDefinitionType.java | 2 +- .../config/score/definition/package-info.java | 4 +- .../director/ScoreDirectorFactoryConfig.java | 8 +- .../config/score/director/package-info.java | 4 +- .../trend/InitializingScoreTrendLevel.java | 2 +- .../core/config/score/trend/package-info.java | 4 +- .../core/config/solver/EnvironmentMode.java | 2 +- .../core/config/solver/SolverConfig.java | 10 +- .../config/solver/SolverManagerConfig.java | 2 +- .../solver/monitoring/MonitoringConfig.java | 4 +- .../solver/monitoring/SolverMetric.java | 2 +- .../solver/monitoring/package-info.java | 4 +- .../core/config/solver/package-info.java | 4 +- .../core/config/solver/random/RandomType.java | 2 +- .../config/solver/random/package-info.java | 4 +- .../TerminationCompositionStyle.java | 2 +- .../solver/termination/TerminationConfig.java | 8 +- .../solver/termination/package-info.java | 4 +- .../core/impl/io/jaxb/GenericJaxbIO.java | 11 +- .../adapter/JaxbCustomPropertiesAdapter.java | 8 +- .../io/jaxb/adapter/JaxbDurationAdapter.java | 2 +- .../io/jaxb/adapter/JaxbLocaleAdapter.java | 2 +- .../adapter/JaxbOffsetDateTimeAdapter.java | 2 +- .../core/impl/io/jaxb/GenericJaxbIOTest.java | 6 +- .../JaxbCustomPropertiesAdapterTest.java | 14 +- core/optaplanner-core/pom.xml | 2 +- core/pom.xml | 2 +- optaplanner-benchmark/pom.xml | 5 +- .../config/PlannerBenchmarkConfig.java | 12 +- .../config/ProblemBenchmarksConfig.java | 4 +- .../config/SolverBenchmarkConfig.java | 4 +- .../SolverBenchmarkBluePrintConfig.java | 2 +- .../SolverBenchmarkBluePrintType.java | 2 +- .../config/blueprint/package-info.java | 4 +- .../benchmark/config/package-info.java | 6 +- .../config/ranking/SolverRankingType.java | 2 +- .../config/ranking/package-info.java | 4 +- .../config/report/BenchmarkReportConfig.java | 4 +- .../benchmark/config/report/package-info.java | 4 +- .../statistic/ProblemStatisticType.java | 2 +- .../config/statistic/SingleStatisticType.java | 2 +- .../config/statistic/package-info.java | 4 +- .../impl/loader/FileProblemProvider.java | 2 +- .../impl/loader/InstanceProblemProvider.java | 2 +- .../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 +- .../impl/statistic/ProblemStatistic.java | 8 +- .../statistic/PureSubSingleStatistic.java | 2 +- .../impl/statistic/SubSingleStatistic.java | 6 +- ...MatchTotalBestScoreSubSingleStatistic.java | 2 +- ...MatchTotalStepScoreSubSingleStatistic.java | 2 +- ...veTypeBestScoreDiffSubSingleStatistic.java | 2 +- ...veTypeStepScoreDiffSubSingleStatistic.java | 2 +- .../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 +- .../solver/OptaPlannerSolverReconciler.java | 2 +- .../OptaPlannerSolverReconcilerTest.java | 4 +- .../optaplanner-persistence-common/pom.xml | 2 +- .../optaplanner-persistence-jackson/pom.xml | 2 +- .../optaplanner-persistence-jaxb/pom.xml | 6 +- .../api/score/AbstractScoreJaxbAdapter.java | 2 +- .../score/PolymorphicScoreJaxbAdapter.java | 6 +- .../domain/solution/JaxbSolutionFileIO.java | 8 +- .../score/AbstractScoreJaxbAdapterTest.java | 8 +- .../PolymorphicScoreJaxbAdapterTest.java | 4 +- .../BendableScoreJaxbAdapterTest.java | 4 +- ...endableBigDecimalScoreJaxbAdapterTest.java | 4 +- .../BendableLongScoreJaxbAdapterTest.java | 4 +- .../HardMediumSoftScoreJaxbAdapterTest.java | 4 +- ...iumSoftBigDecimalScoreJaxbAdapterTest.java | 4 +- ...ardMediumSoftLongScoreJaxbAdapterTest.java | 4 +- .../HardSoftScoreJaxbAdapterTest.java | 4 +- ...ardSoftBigDecimalScoreJaxbAdapterTest.java | 4 +- .../HardSoftLongScoreJaxbAdapterTest.java | 4 +- .../simple/SimpleScoreJaxbAdapterTest.java | 4 +- .../SimpleBigDecimalScoreJaxbAdapterTest.java | 4 +- .../SimpleLongScoreJaxbAdapterTest.java | 4 +- .../testdata/domain/JaxbTestdataEntity.java | 4 +- .../testdata/domain/JaxbTestdataObject.java | 2 +- .../testdata/domain/JaxbTestdataSolution.java | 8 +- .../testdata/domain/JaxbTestdataValue.java | 2 +- .../optaplanner-persistence-jpa/pom.xml | 25 +- .../bendable/BendableScoreConverter.java | 4 +- .../BendableBigDecimalScoreConverter.java | 4 +- .../BendableLongScoreConverter.java | 4 +- .../HardMediumSoftScoreConverter.java | 4 +- ...ardMediumSoftBigDecimalScoreConverter.java | 4 +- .../HardMediumSoftLongScoreConverter.java | 4 +- .../hardsoft/HardSoftScoreConverter.java | 4 +- .../HardSoftBigDecimalScoreConverter.java | 4 +- .../HardSoftLongScoreConverter.java | 4 +- .../buildin/simple/SimpleScoreConverter.java | 4 +- .../SimpleBigDecimalScoreConverter.java | 4 +- .../simplelong/SimpleLongScoreConverter.java | 4 +- .../score/AbstractScoreHibernateType.java | 248 ------------------ .../bendable/BendableScoreHibernateType.java | 51 ---- .../BendableBigDecimalScoreHibernateType.java | 51 ---- .../BendableLongScoreHibernateType.java | 50 ---- .../HardMediumSoftScoreHibernateType.java | 45 ---- ...ediumSoftBigDecimalScoreHibernateType.java | 46 ---- .../HardMediumSoftLongScoreHibernateType.java | 45 ---- .../hardsoft/HardSoftScoreHibernateType.java | 45 ---- .../HardSoftBigDecimalScoreHibernateType.java | 45 ---- .../HardSoftLongScoreHibernateType.java | 45 ---- .../simple/SimpleScoreHibernateType.java | 45 ---- .../SimpleBigDecimalScoreHibernateType.java | 45 ---- .../SimpleLongScoreHibernateType.java | 45 ---- .../bendable/BendableScoreConverterTest.java | 4 +- .../BendableBigDecimalScoreConverterTest.java | 4 +- .../BendableLongScoreConverterTest.java | 4 +- .../HardMediumSoftScoreConverterTest.java | 4 +- ...ediumSoftBigDecimalScoreConverterTest.java | 4 +- .../HardMediumSoftLongScoreConverterTest.java | 4 +- .../hardsoft/HardSoftScoreConverterTest.java | 4 +- .../HardSoftBigDecimalScoreConverterTest.java | 4 +- .../HardSoftLongScoreConverterTest.java | 4 +- .../simple/SimpleScoreConverterTest.java | 4 +- .../SimpleBigDecimalScoreConverterTest.java | 4 +- .../SimpleLongScoreConverterTest.java | 4 +- .../jpa/impl/AbstractScoreJpaTest.java | 14 +- .../BendableScoreHibernateTypeTest.java | 71 ----- ...dableBigDecimalScoreHibernateTypeTest.java | 86 ------ .../BendableLongScoreHibernateTypeTest.java | 73 ------ .../HardMediumSoftScoreHibernateTypeTest.java | 70 ----- ...mSoftBigDecimalScoreHibernateTypeTest.java | 78 ------ ...dMediumSoftLongScoreHibernateTypeTest.java | 71 ----- .../HardSoftScoreHibernateTypeTest.java | 69 ----- ...dSoftBigDecimalScoreHibernateTypeTest.java | 75 ------ .../HardSoftLongScoreHibernateTypeTest.java | 69 ----- .../simple/SimpleScoreHibernateTypeTest.java | 69 ----- ...impleBigDecimalScoreHibernateTypeTest.java | 71 ----- .../SimpleLongScoreHibernateTypeTest.java | 69 ----- .../optaplanner-persistence-jsonb/pom.xml | 16 +- .../jsonb/api/OptaPlannerJsonbConfig.java | 8 +- .../api/score/AbstractScoreJsonbAdapter.java | 2 +- .../api/AbstractJsonbJsonAdapterTest.java | 6 +- .../jsonb/api/OptaPlannerJsonbConfigTest.java | 6 +- .../score/AbstractScoreJsonbAdapterTest.java | 6 +- .../BendableScoreJsonbAdapterTest.java | 2 +- ...ndableBigDecimalScoreJsonbAdapterTest.java | 2 +- .../BendableLongScoreJsonbAdapterTest.java | 2 +- .../HardMediumSoftScoreJsonbAdapterTest.java | 2 +- ...umSoftBigDecimalScoreJsonbAdapterTest.java | 2 +- ...rdMediumSoftLongScoreJsonbAdapterTest.java | 2 +- .../HardSoftScoreJsonbAdapterTest.java | 2 +- ...rdSoftBigDecimalScoreJsonbAdapterTest.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 +- ...BenchmarkProcessorBenchmarkConfigTest.java | 2 +- ...ProcessorInheritedSolverBenchmarkTest.java | 2 +- ...nchmarkProcessorNoBenchmarkConfigTest.java | 2 +- ...enchmarkProcessorOnlySolverConfigTest.java | 2 +- ...taPlannerBenchmarkProcessorPhasesTest.java | 2 +- ...rSpentLimitConfiguredPerBenchmarkTest.java | 2 +- .../integration-test/pom.xml | 2 +- .../it/OptaPlannerBenchmarkTestResource.java | 10 +- .../optaplanner-quarkus-benchmark/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../OptaPlannerBenchmarkBeanProvider.java | 4 +- ...lableOptaPlannerBenchmarkBeanProvider.java | 4 +- .../deployment/pom.xml | 2 +- .../integration-test/pom.xml | 2 +- .../jackson/it/OptaPlannerTestResource.java | 6 +- .../optaplanner-quarkus-jackson/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../OptaPlannerObjectMapperCustomizer.java | 2 +- .../deployment/pom.xml | 2 +- .../integration-test/pom.xml | 2 +- .../jsonb/it/OptaPlannerTestResource.java | 6 +- .../optaplanner-quarkus-jsonb/pom.xml | 2 +- .../optaplanner-quarkus-jsonb/runtime/pom.xml | 2 +- .../OptaPlannerJsonbConfigCustomizer.java | 4 +- .../optaplanner-quarkus/deployment/pom.xml | 2 +- .../GizmoMemberAccessorEntityEnhancer.java | 2 +- .../deployment/OptaPlannerProcessor.java | 2 +- ...ptaPlannerProcessorChainedXMLNoneTest.java | 2 +- ...nerProcessorExtendedSolutionSolveTest.java | 2 +- ...erProcessorGeneratedGizmoSupplierTest.java | 2 +- ...aPlannerProcessorGizmoKitchenSinkTest.java | 2 +- ...taPlannerProcessorInterfaceEntityTest.java | 2 +- .../OptaPlannerProcessorInvalidTest.java | 2 +- ...nnerProcessorOnlyMultiConstructorTest.java | 2 +- ...cessorOverridePropertiesAtRuntimeTest.java | 10 +- .../OptaPlannerProcessorPlanningIdTest.java | 2 +- ...lannerProcessorPrivateConstructorTest.java | 2 +- .../OptaPlannerProcessorSolveTest.java | 2 +- ...nerProcessorSolverPropertiesBavetTest.java | 2 +- ...aPlannerProcessorSolverPropertiesTest.java | 2 +- .../OptaPlannerProcessorXMLDefaultTest.java | 2 +- .../OptaPlannerProcessorXMLNoneTest.java | 2 +- .../OptaPlannerProcessorXMLPropertyTest.java | 2 +- ...lannerProcessorConstraintProviderTest.java | 2 +- ...nerProcessorConstraintsDrlDefaultTest.java | 2 +- ...ptaPlannerProcessorConstraintsDrlTest.java | 2 +- .../rest/SolverConfigTestResource.java | 12 +- ...ConstraintVerifierBavetStreamImplTest.java | 2 +- ...onstraintVerifierDroolsStreamImplTest.java | 2 +- .../OptaPlannerConstraintVerifierTest.java | 2 +- .../devui-integration-test/pom.xml | 4 +- .../it/devui/OptaPlannerTestResource.java | 10 +- .../drl-integration-test/pom.xml | 2 +- .../drl/it/OptaPlannerTestResource.java | 10 +- .../integration-test/pom.xml | 2 +- .../quarkus/it/OptaPlannerTestResource.java | 10 +- .../optaplanner-quarkus/pom.xml | 2 +- .../reflection-integration-test/pom.xml | 2 +- .../reflection/OptaPlannerTestResource.java | 10 +- .../optaplanner-quarkus/runtime/pom.xml | 2 +- .../bean/DefaultOptaPlannerBeanProvider.java | 6 +- .../UnavailableOptaPlannerBeanProvider.java | 4 +- .../nativeimage/Substitute_ConfigUtils.java | 2 +- optaplanner-quarkus-integration/pom.xml | 2 +- .../pom.xml | 2 +- .../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 +- 329 files changed, 591 insertions(+), 2295 deletions(-) delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/AbstractScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendable/BendableScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablelong/BendableLongScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoft/HardMediumSoftScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoft/HardSoftScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftlong/HardSoftLongScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simple/SimpleScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplebigdecimal/SimpleBigDecimalScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/main/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplelong/SimpleLongScoreHibernateType.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendable/BendableScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/bendablelong/BendableLongScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoft/HardMediumSoftScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftbigdecimal/HardMediumSoftBigDecimalScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardmediumsoftlong/HardMediumSoftLongScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoft/HardSoftScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftbigdecimal/HardSoftBigDecimalScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/hardsoftlong/HardSoftLongScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simple/SimpleScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplebigdecimal/SimpleBigDecimalScoreHibernateTypeTest.java delete mode 100644 optaplanner-persistence/optaplanner-persistence-jpa/src/test/java/org/optaplanner/persistence/jpa/impl/score/buildin/simplelong/SimpleLongScoreHibernateTypeTest.java delete mode 100644 optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories diff --git a/build/optaplanner-bom/pom.xml b/build/optaplanner-bom/pom.xml index f093d665bcf..2a2fc424903 100644 --- a/build/optaplanner-bom/pom.xml +++ b/build/optaplanner-bom/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../../pom.xml diff --git a/build/optaplanner-build-parent/pom.xml b/build/optaplanner-build-parent/pom.xml index 9655d2bac8e..db5a4c4eeec 100644 --- a/build/optaplanner-build-parent/pom.xml +++ b/build/optaplanner-build-parent/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../../pom.xml @@ -42,11 +42,11 @@ 8.44.0.Final - 1.2.9 + 1.4.6 2.20.0 1.4.20 - 5.1.4 - 2.16.10.Final + 6.0.3 + 3.0.0.Final 3.6.1 1.10.0 5.2.3 @@ -55,9 +55,9 @@ 2.0.6.1 1.5.4 1.19.3 - 1.7.36 - 5.3.27 - 2.7.12 + 2.0.6 + 6.0.8 + 3.0.7 @@ -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). --> - 2.5.0 + 3.1.0 1.14.4 0.15.0 1.23 diff --git a/build/optaplanner-distribution-internal/pom.xml b/build/optaplanner-distribution-internal/pom.xml index 490d2c7d82f..5614f5f418e 100644 --- a/build/optaplanner-distribution-internal/pom.xml +++ b/build/optaplanner-distribution-internal/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../optaplanner-build-parent/pom.xml diff --git a/build/optaplanner-ide-config/pom.xml b/build/optaplanner-ide-config/pom.xml index 26be4a00c39..fa50983d117 100644 --- a/build/optaplanner-ide-config/pom.xml +++ b/build/optaplanner-ide-config/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../../pom.xml optaplanner-ide-config diff --git a/build/optaplanner-javadoc/pom.xml b/build/optaplanner-javadoc/pom.xml index 57c6d4a902c..4efc94fb69c 100644 --- a/build/optaplanner-javadoc/pom.xml +++ b/build/optaplanner-javadoc/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../optaplanner-build-parent/pom.xml 4.0.0 @@ -83,10 +83,6 @@ org.ow2.asm asm - - org.hibernate - hibernate-core - org.graalvm.sdk graal-sdk diff --git a/core/optaplanner-constraint-drl/pom.xml b/core/optaplanner-constraint-drl/pom.xml index 2a96c0820a7..0de1fb47bdf 100644 --- a/core/optaplanner-constraint-drl/pom.xml +++ b/core/optaplanner-constraint-drl/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-core-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/core/optaplanner-constraint-streams-bavet/pom.xml b/core/optaplanner-constraint-streams-bavet/pom.xml index 56fdc7f966d..d67a0ae8aa4 100644 --- a/core/optaplanner-constraint-streams-bavet/pom.xml +++ b/core/optaplanner-constraint-streams-bavet/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-core-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/core/optaplanner-constraint-streams-common/pom.xml b/core/optaplanner-constraint-streams-common/pom.xml index 8668fdb2bf1..50707b0d249 100644 --- a/core/optaplanner-constraint-streams-common/pom.xml +++ b/core/optaplanner-constraint-streams-common/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-core-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/core/optaplanner-constraint-streams-drools/pom.xml b/core/optaplanner-constraint-streams-drools/pom.xml index b91e705140e..c36553ee430 100644 --- a/core/optaplanner-constraint-streams-drools/pom.xml +++ b/core/optaplanner-constraint-streams-drools/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-core-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/core/optaplanner-core-impl/pom.xml b/core/optaplanner-core-impl/pom.xml index a093683d8e6..f7754f08cd7 100644 --- a/core/optaplanner-core-impl/pom.xml +++ b/core/optaplanner-core-impl/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-core-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-core-impl @@ -140,6 +140,9 @@ org.revapi revapi-maven-plugin + + true + org.codehaus.mojo 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 b64a4c796e4..147c0769a65 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 784a1e09681..3a86039bce7 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 82aa22ec28d..a076371acbc 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 @@ 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 cc8ea1d57b9..0ae809dd910 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 @@ 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 ca24f6de3c1..5e801dbbfb3 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 05908c03cbb..0b2ed91df33 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 @@ 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 c7d5b09ac6f..f56cc263cc8 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 c21f3f42a8d..23e25631bf6 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 d5ee8c215b5..e96223e8830 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 088214dac02..f7220ad7380 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 a62075a864a..70401425f9e 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 @@ 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 39d2c5e47ab..dd480518bfd 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.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 b50da8d0acf..4566b974cea 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 @@ 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 25aba29c3e5..5c80712db1c 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 a7e6b391c3b..31205279fad 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 @@ 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 07253597b72..6386d0477e9 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 ed7209c4604..874eb4bdade 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 @@ 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 2b82bede632..66e14662927 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 3f5a81ba0cf..8cc686be26c 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 6191a7dd403..bbde2dae29f 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 646fb787995..07d60382f91 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 8ca21eaf45c..7e2df850865 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 04a220b0998..d0e4d903bd1 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.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 df9eabc3a2f..49c5d6f033a 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 b23798382f4..6f553478d3e 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 fb432ef4585..6e6671b740a 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 2016801e470..c74753a13b8 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 @@ 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 2a12b9d5e4e..01e4a997979 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 56c641dcfff..1d51d8fa65e 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 5b4dd1be74c..fdc6d5e5630 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 @@ 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 4c66378ebf9..b27429452b7 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 @@ 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 d84e710c169..7979ae3f387 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 ee9e033fe1f..0f921881048 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 @@ 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 dee495602a8..f4e313a301c 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 @@ 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 ca879eb962a..750f3ea834c 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 5e6f19e816c..481da83cf13 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.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 8edb4b2515e..6cce7486d9a 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.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 caad83a64e7..c91e6d6f6ba 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.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 eca0415ac8b..bacf19c200e 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 edb49c902af..2988cba8dde 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 @@ 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 c1435d026ac..5561b9e6d5f 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 @@ 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 c4c58522810..3e2fa560199 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 faec1f954b9..992e45305a6 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 @@ 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 7c966892c4f..88a3e03d366 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 @@ 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 25ab5d75b95..d7df3ec0acf 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 @@ 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 4f1c84cc0e6..d674f22b7db 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 @@ 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 bba2ee5baf2..b52175d4711 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 @@ 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 87a40af9cca..7f9390e0512 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.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 a1ea86f37a9..6134674ed40 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 @@ 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 171442660ca..1478bf00592 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 @@ 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 4f1b6fa07c2..74ca0fec5a5 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 @@ 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 9bfb564f39d..62bb525c4f6 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 @@ 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 bd5df2a3dbf..1484c4b4f5c 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 07ae0d1ffb8..4162d43f220 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 @@ 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 11eb2837f7b..95c417960c6 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 @@ 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 ef7166e248b..6a7e807710d 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 @@ 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 07d7eb062f3..11156372443 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 @@ 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 9c6d1105b3e..f0765e49c36 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 @@ 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 2bce53877fc..97f63c4823d 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 ef5a3f0ffdc..f573822c0ae 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 4114b070ffa..d6b981d3244 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 fcfcaf7810a..cde74f1a8f0 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 93cc248cad3..d431cc22e76 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 86b145f20e9..a1a7312d4e4 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 @@ 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 dedcf2f4f21..4d4d8e96ba0 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 9e73c0f4c1e..13b08dd0d46 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 @@ 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 515116d4545..e121c106e28 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 c650513a0b2..0b0295bc74b 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 1d6195c5854..d66534ef899 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 @@ 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 00dc631da73..59059c2e92b 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 @@ 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 69d5f5d9b06..3082322ce3d 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 298ac27a1eb..08a54e0ffda 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 @@ 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 252c11b878b..61aa59961f6 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 faeb15eb02b..76cecf1698e 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 c8827f79e56..13a51b9766c 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 d36bdcb5420..aca45dc2cd4 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 b5d5c76908e..c0faf91d98d 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 @@ 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 26633fed1fb..dce5bf89b2c 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 9fc571666b4..7715f6367ea 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 02c7e2ecf51..5ae86fc8a83 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 283c76f6575..3f10e88fab9 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 ab98bca5a9c..13a781b8f94 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.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 c5e62a2d580..146a330cb93 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 01c5e2a92e2..b770504614a 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 0225c5d405d..cda7bb3a4a1 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.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 8cb43999e55..b6ae9438988 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 41ba1bc2776..e431fe62c03 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 0a9c3a5e8cf..ce77eb4dd1f 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 58bb072d069..7bea2225609 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 569c2140a66..0418d1ce32e 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.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 467040ff85d..e27e6e643cc 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 1bd3d998140..d2b9a3f9b8d 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 638d5ba31b6..2c9ae93b647 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 8d8425e2896..004ab915c7b 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 @@ 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 dede0dda599..45deb9b84cb 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.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 870b7d49e83..f42a19f5d8b 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 @@ 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 1d9915bb37d..2a2620cd60d 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 @@ 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 7a2a02fb665..c699bdbdd60 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.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 4b2015a7379..2131a5affa3 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 c99762f6048..547e4344fcf 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 742f60201b2..60677cf8d9b 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 dd8b06b9ad6..4c90d4df108 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 fc1d28ab8d9..a76be33ace2 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 c4f579ed09c..4758697f492 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.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 ba160cf3d88..8f38398d267 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 bc18ad4b418..4a4c536d3f8 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.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 81221535ea5..9547d8cac29 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.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 cdd7ab5dc41..77c355a445d 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 @@ 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 { 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 4aad4b5f4ee..fdbc6dfb62f 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 @@ import java.util.Locale; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class JaxbLocaleAdapter extends XmlAdapter { 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 ba8ca89d9ee..0074620fa1d 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.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 { 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 4cf641012c5..8399805782d 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.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 b091775e909..8205596a47a 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.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 4d9c88e2115..a1193863198 100644 --- a/core/optaplanner-core/pom.xml +++ b/core/optaplanner-core/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-core-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index 7738dc5199b..0aef195d28e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml 4.0.0 diff --git a/optaplanner-benchmark/pom.xml b/optaplanner-benchmark/pom.xml index 3bfabef1bb7..9f1747c3389 100644 --- a/optaplanner-benchmark/pom.xml +++ b/optaplanner-benchmark/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml @@ -170,6 +170,9 @@ org.revapi revapi-maven-plugin + + true + org.apache.maven.plugins 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 7c144da5998..14fc809f2b3 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.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 cc0c530227e..871ab5a2a8d 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.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 2be7c0ef1f4..73f63622fbb 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 @@ 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 6638cda8c7e..a31d08cb5f5 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 @@ 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 2a31f4e6aec..1f56891143f 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 @@ 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 05bd2dd8194..9d88757e124 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 1f359e7f6e6..d8fe4ae08c3 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 45c0e09dc79..79a3e3b1cec 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 1436d7af51b..ad7e2913346 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 594351a82d7..e74fe952be2 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.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 11001431f07..6742fd82839 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 43f43012e97..3787adcf1cb 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 @@ 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 619b6d8c7fd..aecc77ce0de 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 4ec856d5ed5..209e559b936 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 28c8be0b825..9e63b63474e 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 @@ 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 0f1f9374b33..6ff1ff0f091 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 @@ 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 583eb612983..d1e833b12cb 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 dc6374665cc..366a920fec0 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.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 dc81a09230e..37217ae6ad0 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.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 649d09af682..9dba11998bf 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.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 e22e935bfeb..6503ecea5e2 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.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 09f6fe54b55..e477b85d633 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.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 cb961883492..1aab0492785 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 @@ 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 3f385641a09..2ce0d4bc82f 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.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 ef05ee62e73..0c06d8c2064 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 @@ 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 dce08829a14..f30447d5b0c 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.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 fdd1c74460f..e5180d261d5 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.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 57fb32e27fb..93844fa20a5 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.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 50433f71d98..e495e370a93 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.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 1d9f823a65d..4998ce91c0c 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.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 057a4bb7543..5687d3da161 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.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 bfbd42db747..bf52fee8cbe 100755 --- a/optaplanner-docs/pom.xml +++ b/optaplanner-docs/pom.xml @@ -26,7 +26,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml diff --git a/optaplanner-examples/pom.xml b/optaplanner-examples/pom.xml index c26ba11b233..d387f16f7b7 100644 --- a/optaplanner-examples/pom.xml +++ b/optaplanner-examples/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml @@ -173,8 +173,8 @@ - org.glassfish - jakarta.json + jakarta.json + jakarta.json-api org.jfree 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 972a4aed45d..371d7470b12 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.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 621528b7b48..acd5436603f 100644 --- a/optaplanner-migration/pom.xml +++ b/optaplanner-migration/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml diff --git a/optaplanner-operator/pom.xml b/optaplanner-operator/pom.xml index 2416605d02a..0a019bb5d0b 100644 --- a/optaplanner-operator/pom.xml +++ b/optaplanner-operator/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml 4.0.0 @@ -43,7 +43,7 @@ org.optaplanner.operator - 2.15.0.Final + 3.0.0.Final 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 701471bb334..11b61cc73c1 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 @@ 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 81f5201ea13..83515d83768 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.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 46b977d80aa..88af2162d0a 100644 --- a/optaplanner-persistence/optaplanner-persistence-common/pom.xml +++ b/optaplanner-persistence/optaplanner-persistence-common/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-persistence - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-persistence-common diff --git a/optaplanner-persistence/optaplanner-persistence-jackson/pom.xml b/optaplanner-persistence/optaplanner-persistence-jackson/pom.xml index b460c0bb49b..60460f331e1 100644 --- a/optaplanner-persistence/optaplanner-persistence-jackson/pom.xml +++ b/optaplanner-persistence/optaplanner-persistence-jackson/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-persistence - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-persistence-jackson diff --git a/optaplanner-persistence/optaplanner-persistence-jaxb/pom.xml b/optaplanner-persistence/optaplanner-persistence-jaxb/pom.xml index 1ed99430635..a9fe9ad8372 100644 --- a/optaplanner-persistence/optaplanner-persistence-jaxb/pom.xml +++ b/optaplanner-persistence/optaplanner-persistence-jaxb/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-persistence - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-persistence-jaxb @@ -78,8 +78,8 @@ test - org.glassfish - jakarta.json + jakarta.json + jakarta.json-api test 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 06b83dce831..ab0c5e8e806 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 8a18a82fc68..8f40eb0a94f 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 51955c2b94e..0de57b44692 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.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 db9aec8589b..4b70bac3e7f 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 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 0d8e82dcd81..db5e92c89b3 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 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 acbce93436d..915346e58c7 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 56446c079c7..8d727bac763 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 @@ 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 be622de0464..a4933444d0e 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 7ef229ee2f7..73978093dcb 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 86246e1bee3..655af950d8d 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 @@ 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 31eebf8a0ad..59e897c01b2 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 bb090e542dd..b50089deb2d 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 b391e32d5c1..621868a7b86 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 @@ 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 9e7c2384450..71257a4c55a 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 d21240f8dcf..ec7f9fb0132 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 bfe1f2930e5..2f05e512c91 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 @@ 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 2ceb9c675c6..bf23d9a204e 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 6b629d9f972..b7f117a7c71 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 f0c51dc8e79..704a226415f 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 8537a8b3d60..04c17d3eb01 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 @@ 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 37f5419b6a7..1acd4a2bcfe 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 6df2d9e38c9..58709cec565 100644 --- a/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml +++ b/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-persistence - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-persistence-jpa @@ -62,29 +62,6 @@ jakarta.persistence jakarta.persistence-api - - org.hibernate - hibernate-core - - - - javax.activation - javax.activation-api - - - - javax.xml.bind - jaxb-api - - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec - - - - true - 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 793f808e181..a99fd3a4e0a 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 54a7b062aa9..9d639784ad4 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 bce46035783..91c76a5c1d6 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 6f1ae9c3d3b..5dbe5de5dcd 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 56056b0a642..f0e5f68ab4f 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 fc9ee60ef83..ce3304c7e93 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 8eaba7d1c43..a49ef4747be 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 a1f08b97582..5ab62d36db4 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 9cf94d25725..ec8fab02197 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 8a4dee51470..081c673c6a6 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 dfa6bbc64cc..f5e7fa96a9c 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 a8f47366031..afe2f7d58b9 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 5fd6e1531a2..00000000000 --- 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 org.optaplanner.persistence.jpa.api.score.buildin - * 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 da17d365499..00000000000 --- 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 b25f2395dcb..00000000000 --- 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 de7b7be3dcc..00000000000 --- 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 17ed0640ab1..00000000000 --- 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 3504830c4b9..00000000000 --- 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 47b88ae727d..00000000000 --- 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 131b8c10db6..00000000000 --- 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 fe4ddbf5e4e..00000000000 --- 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 4261415edbe..00000000000 --- 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 15475e1bebf..00000000000 --- 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 8b25399014d..00000000000 --- 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 459146a4f1f..00000000000 --- 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 5e64d50b82f..ab52fd52905 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 1500d78f1f4..c47cef45673 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 @@ 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 ff8d42aee2f..238fa3c0c7a 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 25b3c1625b6..fc59d06583e 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 38c2413f6d3..be165b4e2f5 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 @@ 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 a7b50e07610..9e095caa1f9 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 72523480c4a..5d83847efad 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 0d7df67b592..0f896f7dc93 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 @@ 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 745f1295957..1a6bb07df09 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 43c50c01b1d..4f00e96e934 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 dc25bb36ffd..64f361c3f42 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 @@ 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 301fbdbad1f..920595b0a2d 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 86735fe5453..d41bd3f6198 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 @@ 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 22776c13280..00000000000 --- 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 { - - @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 08b455a71f4..00000000000 --- 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 { - - @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 204377e4c1d..00000000000 --- 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 { - - @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 8b919464af6..00000000000 --- 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 { - - @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 f8d7b923520..00000000000 --- 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 { - - @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 34048c7fdd1..00000000000 --- 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 { - - @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 de30fb51bad..00000000000 --- 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 { - - @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 4694288e8cd..00000000000 --- 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 { - - @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 373d6545676..00000000000 --- 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 { - - @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 512bddd38f7..00000000000 --- 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 { - - @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 519c87417b2..00000000000 --- 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 { - - @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 0af855ae4de..00000000000 --- 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 { - - @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 c827656bd47..56d54c23d04 100644 --- a/optaplanner-persistence/optaplanner-persistence-jsonb/pom.xml +++ b/optaplanner-persistence/optaplanner-persistence-jsonb/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-persistence - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-persistence-jsonb @@ -69,24 +69,14 @@ jakarta.json.bind-api - org.glassfish - jakarta.json + jakarta.json + jakarta.json-api runtime org.eclipse yasson test - - - jakarta.json - jakarta.json-api - - - org.glassfish - jakarta.json - - 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 f995458c5ec..16523afa536 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 2c4a17bdda5..5795a58e8d2 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 067d8bccf81..b48543be7ef 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 0c09ea09de7..ea43d9d5002 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 @@ 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 cd9a110b307..e29b7268869 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 @@ 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 e6d5c3e88d2..ac00edcc202 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 64d44b2e878..cc44da968f7 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 @@ 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 3788d996cc0..a44165b0b13 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 fc4363e61d2..e4e0897f303 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 46e377ab2b4..2c7774ff163 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 @@ 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 711c3e01185..8622ce1da7c 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 96d1818c598..cadaf7ef165 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 f40175b10ac..78d8827e58d 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 @@ 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 8a68d7de2e7..54693c6d141 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 af966636fd3..c009b214d7d 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 1cb70bb6eb3..26d13315962 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 @@ 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 2779c1e58d4..3fd4ee56fc5 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 f1ce039cf4f..a79c288bd67 100644 --- a/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml +++ b/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-persistence - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-persistence-xstream diff --git a/optaplanner-persistence/pom.xml b/optaplanner-persistence/pom.xml index 1057fb9cb6c..7f8a58f5a8b 100644 --- a/optaplanner-persistence/pom.xml +++ b/optaplanner-persistence/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml index 1f7108f7302..2cd93c65d09 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 @@ org.optaplanner optaplanner-quarkus-benchmark-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-benchmark-deployment 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 a812d2aa5a2..e24c1663b4e 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.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 2132b8f9571..20a86f9cac2 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 @@ 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 f437ed9acbf..10a74f0ef86 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.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 20d7f788db9..8b030c8c7b1 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.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 c9256e9b6bd..27d8aec4311 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 e37dbfab8a6..08e3b655d44 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.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 c7be99e4655..b6228aa03bf 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 @@ org.optaplanner optaplanner-quarkus-benchmark-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-benchmark-integration-test 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 d8810c70ae4..875a7bc82ac 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 @@ 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 7f00749de89..9a1ec26d180 100644 --- a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/pom.xml +++ b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/pom.xml @@ -24,7 +24,7 @@ org.optaplanner optaplanner-quarkus-integration - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/runtime/pom.xml index 81b38d8c117..3701cf54f3b 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 @@ org.optaplanner optaplanner-quarkus-benchmark-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-benchmark 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 2679e055aab..db9484972f4 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 f8c289728d1..2b36c2e73e1 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 8437cfe3db6..4f1cf4509f8 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 @@ org.optaplanner optaplanner-quarkus-jackson-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-jackson-deployment 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 1686b7dc2c0..a7d2712737c 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 @@ org.optaplanner optaplanner-quarkus-jackson-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-jackson-integration-test 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 1558e9595af..40cc77ecd7a 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 @@ 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 2799b5e5d42..ae57ec2198a 100644 --- a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/pom.xml +++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-quarkus-integration - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-jackson-parent diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/runtime/pom.xml index 25ece58700a..46eda6f1ed3 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 @@ org.optaplanner optaplanner-quarkus-jackson-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-jackson 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 784c23177c1..c1165fe0908 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 0bd27698dbb..5444c1a2b89 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 @@ org.optaplanner optaplanner-quarkus-jsonb-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-jsonb-deployment 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 08c409be77a..9d59f1556d0 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 @@ org.optaplanner optaplanner-quarkus-jsonb-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-jsonb-integration-test 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 2d92261a5bf..66fcd17ec0c 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 @@ 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 5feee42f432..0c41630a83b 100644 --- a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/pom.xml +++ b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-quarkus-integration - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-jsonb-parent diff --git a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/pom.xml b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/runtime/pom.xml index dcf5afd35e6..a91626f21bd 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 @@ org.optaplanner optaplanner-quarkus-jsonb-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-jsonb 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 982e37a3a91..60ddd5a9c84 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 1d47e98df5e..4e2e251764a 100644 --- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml +++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-quarkus-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-deployment 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 d463a254d81..37234d6c814 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.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 345979f46e8..1a98bbbad81 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.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 532ab5d8619..73bd318ec4c 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 @@ 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 25910abc520..914a7c43dd8 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.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 227fbd85146..45c126ebce7 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.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 905f9929923..1a1fa901e4f 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 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 6c4596e705a..b14b1192cbb 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.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 89ac9628847..0dd8671142c 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 @@ 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 58e8e6e59c9..c4cc27087c9 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 @@ 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 b4338bd29f2..5f2686eaf19 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.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 90cd312f888..6c3d85b0229 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 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 078c80dc131..ef99e87275a 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 @@ 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 c6631ef00da..7efb75b7d79 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.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 a33476ff622..5d72e3406aa 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 @@ 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 56c32354687..ff7d19798e3 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 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 08966ea95db..93e2ebd5374 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 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 44cc4ef541a..1d7b39dc331 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 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 7a2ef02ee7e..a10e8a726a0 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 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 662b680f38d..31340063551 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 @@ 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 d587c8c0344..a5f26bf7cce 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 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 3ec726a84d9..57976f357a4 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 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 7475ef55289..43aa5140017 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 22f22ffaf3f..29c630625ae 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 @@ 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 db326a56983..24ed5dd9399 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 @@ 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 46cf890d55f..be266755938 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 @@ 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 d69118e63b5..486e83912d4 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 @@ org.optaplanner optaplanner-quarkus-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-devui-integration-test @@ -37,7 +37,7 @@ **/* - /q/dev + /q/dev-v1 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 e871202b98c..9b9e31d2164 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 @@ 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 aeb318f9478..4b1a6f35cab 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 @@ org.optaplanner optaplanner-quarkus-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-drl-integration-test 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 e68d401d1ce..afa0396e452 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 @@ 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 2768f7cc1fd..eb77475ce0d 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 @@ org.optaplanner optaplanner-quarkus-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-integration-test 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 f13ebc612af..c29356fa892 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 @@ 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 e8cd235cb26..9619e4ac920 100644 --- a/optaplanner-quarkus-integration/optaplanner-quarkus/pom.xml +++ b/optaplanner-quarkus-integration/optaplanner-quarkus/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-quarkus-integration - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-parent 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 de8f71ae272..4f6006882c2 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 @@ org.optaplanner optaplanner-quarkus-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus-reflection-integration-test 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 223ed3482cf..bf8082f4420 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 @@ 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 5558b0852e2..4e3007081a4 100644 --- a/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/pom.xml +++ b/optaplanner-quarkus-integration/optaplanner-quarkus/runtime/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-quarkus-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-quarkus 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 f8e6d20ffd9..a1c0daec575 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 7a5cb578819..52a009ef1a9 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 284ee3868d5..c1349829041 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 @@ 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 9cbb2a1eaf3..b4f5d6b4024 100644 --- a/optaplanner-quarkus-integration/pom.xml +++ b/optaplanner-quarkus-integration/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml diff --git a/optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/pom.xml b/optaplanner-spring-integration/optaplanner-spring-boot-autoconfigure/pom.xml index 6c12fb51106..829a6d0b5ca 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 @@ org.optaplanner optaplanner-spring-integration - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-spring-boot-autoconfigure 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 e49d545f197..00000000000 --- 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 d54fd6f412f..88be7ea5b86 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 @@ org.optaplanner optaplanner-spring-integration - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT optaplanner-spring-boot-starter diff --git a/optaplanner-spring-integration/pom.xml b/optaplanner-spring-integration/pom.xml index 78455a5367c..85802affd50 100644 --- a/optaplanner-spring-integration/pom.xml +++ b/optaplanner-spring-integration/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml diff --git a/optaplanner-test/pom.xml b/optaplanner-test/pom.xml index 8add6e9cd8b..c223dddcc1d 100644 --- a/optaplanner-test/pom.xml +++ b/optaplanner-test/pom.xml @@ -25,7 +25,7 @@ org.optaplanner optaplanner-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build/optaplanner-build-parent/pom.xml @@ -91,6 +91,9 @@ org.revapi revapi-maven-plugin + + true + org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index c40be12b467..c6b275aebaf 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.optaplanner optaplanner-parent pom - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT OptaPlanner multiproject parent From 090e53222b061079ac59f49392cc8fbe2369180a Mon Sep 17 00:00:00 2001 From: Luca Molteni Date: Mon, 4 Dec 2023 10:27:51 +0100 Subject: [PATCH 2/3] Upgrade Quarkus to LTS 3.2.9 --- build/optaplanner-build-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/optaplanner-build-parent/pom.xml b/build/optaplanner-build-parent/pom.xml index db5a4c4eeec..f7c6f60e358 100644 --- a/build/optaplanner-build-parent/pom.xml +++ b/build/optaplanner-build-parent/pom.xml @@ -46,7 +46,7 @@ 2.20.0 1.4.20 6.0.3 - 3.0.0.Final + 3.2.9.Final 3.6.1 1.10.0 5.2.3 From ef26c656a2e133c2eba199b90f59212c21e32e28 Mon Sep 17 00:00:00 2001 From: Luca Molteni Date: Mon, 18 Dec 2023 13:57:08 +0100 Subject: [PATCH 3/3] Remove Java 11 from GH Actions --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index d4823b91695..94a37ff9994 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 }}