From 8a64a2a55ca65c436f1d4115178da91816e48d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 19 Sep 2022 13:33:29 +0200 Subject: [PATCH] HSEARCH-4394 Move main code from Java EE to Jakarta EE --- build/config/pom.xml | 6 +- distribution/pom.xml | 26 +++--- distribution/src/main/assembly/dist.xml | 10 +-- documentation/pom.xml | 1 + .../asciidoc/reference/compatibility.asciidoc | 10 +-- .../asciidoc/reference/integrations.asciidoc | 27 ++++--- .../documentation/analysis/AnalysisIT.java | 8 +- .../analysis/ElasticsearchAnalysisIT.java | 8 +- .../analysis/LuceneAnalysisIT.java | 8 +- .../backend/elasticsearch/client/Book.java | 4 +- .../client/ElasticsearchGetClientIT.java | 2 +- .../ElasticsearchHttpClientConfigurerIT.java | 6 +- .../elasticsearch/indexmanager/Book.java | 4 +- .../ElasticsearchIndexManagerIT.java | 2 +- .../backend/elasticsearch/layout/Book.java | 6 +- .../ElasticsearchCustomLayoutStrategyIT.java | 2 +- .../ElasticsearchCustomIndexMappingIT.java | 2 +- .../ElasticsearchCustomIndexSettingsIT.java | 2 +- .../type/asnative/CompanyServer.java | 6 +- .../asnative/ElasticsearchNativeTypeIT.java | 2 +- .../backend/lucene/analyzer/Book.java | 4 +- .../lucene/analyzer/LuceneGetAnalyzerIT.java | 2 +- .../backend/lucene/indexmanager/Book.java | 4 +- .../indexmanager/LuceneGetIndexSizeIT.java | 2 +- .../lowlevel/LuceneLowLevelIndexReaderIT.java | 2 +- .../type/asnative/LuceneNativeTypeIT.java | 2 +- .../backend/lucene/type/asnative/WebPage.java | 4 +- .../AlternativeBinderIT.java | 2 +- .../alternativebinder/BlogEntry.java | 8 +- .../DependenciesFromOtherEntityIT.java | 2 +- .../fromotherentity/ScientificPaper.java | 6 +- .../containers/property/Book.java | 18 ++--- .../containers/property/BookEdition.java | 8 +- .../DependenciesContainersPropertyIT.java | 2 +- .../dependencies/containers/simple/Book.java | 18 ++--- .../containers/simple/BookEdition.java | 8 +- .../DependenciesContainersSimpleIT.java | 2 +- .../bridge/dependencies/simple/Author.java | 8 +- .../orm/bridge/dependencies/simple/Book.java | 8 +- .../simple/DependenciesSimpleIT.java | 2 +- .../document/model/dsl/dynamic/Book.java | 6 +- .../dynamic/DocumentModelDslDynamicIT.java | 2 +- .../dsl/object/DocumentModelDslObjectIT.java | 2 +- .../document/model/dsl/object/Invoice.java | 10 +-- .../model/dsl/object/InvoiceLineItem.java | 2 +- .../document/model/dsl/simple/Author.java | 6 +- .../document/model/dsl/simple/Book.java | 8 +- .../dsl/simple/DocumentModelDslSimpleIT.java | 2 +- .../bridge/identifierbridge/binder/Book.java | 4 +- .../identifierbridge/binder/BookId.java | 2 +- .../binder/IdentifierBinderIT.java | 2 +- .../identifierbridge/compatible/Book.java | 4 +- .../compatible/BookOrMagazineId.java | 2 +- .../IdentifierBridgeCompatibleIT.java | 2 +- .../identifierbridge/compatible/Magazine.java | 4 +- .../IdentifierBridgeOrmContextIT.java | 2 +- .../identifierbridge/ormcontext/MyEntity.java | 4 +- .../bridge/identifierbridge/param/Book.java | 4 +- .../param/IdentifierBridgeParamIT.java | 2 +- .../identifierbridge/param/context/Book.java | 4 +- .../context/IdentifierBridgeParamIT.java | 2 +- .../bridge/identifierbridge/simple/Book.java | 4 +- .../identifierbridge/simple/BookId.java | 2 +- .../simple/IdentifierBridgeSimpleIT.java | 2 +- .../orm/bridge/namedpredicate/ItemStock.java | 4 +- .../namedpredicate/NamedPredicateIT.java | 2 +- .../bridgedelement/Invoice.java | 10 +-- .../PropertyBridgeBridgedElementIT.java | 2 +- .../propertybridge/ormcontext/MyEntity.java | 6 +- .../PropertyBridgeOrmContextIT.java | 2 +- .../bridge/propertybridge/param/Invoice.java | 10 +-- .../propertybridge/param/InvoiceLineItem.java | 2 +- .../param/PropertyBridgeParamIT.java | 2 +- .../propertybridge/param/context/Invoice.java | 10 +-- .../param/context/PropertyBridgeParamIT.java | 2 +- .../bridge/propertybridge/simple/Invoice.java | 10 +-- .../simple/InvoiceLineItem.java | 2 +- .../simple/PropertyBridgeSimpleIT.java | 2 +- .../mapper/orm/bridge/resolver/Book.java | 4 +- .../orm/bridge/resolver/BridgeResolverIT.java | 2 +- .../orm/bridge/resolver/MyCoordinates.java | 4 +- .../orm/bridge/resolver/MyProductId.java | 2 +- .../conditionalindexing/Book.java | 6 +- .../RoutingBridgeConditionalIndexingIT.java | 2 +- .../routingbridge/ormcontext/MyEntity.java | 4 +- .../ormcontext/RoutingBridgeOrmContextIT.java | 2 +- .../bridge/routingbridge/routingkey/Book.java | 6 +- .../routingkey/RoutingBridgeRoutingKeyIT.java | 2 +- .../typebridge/ormcontext/MyEntity.java | 6 +- .../ormcontext/TypeBridgeOrmContextIT.java | 2 +- .../orm/bridge/typebridge/param/Author.java | 6 +- .../typebridge/param/TypeBridgeParamIT.java | 2 +- .../typebridge/param/context/Author.java | 6 +- .../param/context/TypeBridgeParamIT.java | 2 +- .../orm/bridge/typebridge/simple/Author.java | 6 +- .../typebridge/simple/TypeBridgeSimpleIT.java | 2 +- .../bridge/types/dsl/dslconverter/Book.java | 8 +- .../IndexFieldTypeDslDslConverterIT.java | 2 +- .../types/dsl/projectionconverter/Book.java | 8 +- ...ndexFieldTypeDslProjectionConverterIT.java | 2 +- .../orm/bridge/types/dsl/simple/Book.java | 8 +- .../dsl/simple/IndexFieldTypeDslSimpleIT.java | 2 +- .../orm/bridge/valuebridge/binder/Book.java | 8 +- .../binder/ValueBridgeBinderIT.java | 2 +- .../bridge/valuebridge/compatible/Book1.java | 8 +- .../bridge/valuebridge/compatible/Book2.java | 8 +- .../compatible/ValueBridgeCompatibleIT.java | 2 +- .../bridge/valuebridge/indexnullas/Book.java | 8 +- .../indexnullas/ValueBridgeIndexNullAsIT.java | 2 +- .../valuebridge/ormcontext/MyEntity.java | 6 +- .../ormcontext/ValueBridgeOrmContextIT.java | 2 +- .../orm/bridge/valuebridge/param/Book.java | 8 +- .../valuebridge/param/ValueBridgeParamIT.java | 2 +- .../valuebridge/param/context/Book.java | 8 +- .../param/context/ValueBridgeParamIT.java | 2 +- .../bridge/valuebridge/projection/Book.java | 8 +- .../projection/ValueBridgeProjectionIT.java | 2 +- .../orm/bridge/valuebridge/simple/Book.java | 8 +- .../simple/ValueBridgeSimpleIT.java | 2 +- .../mapper/orm/containerextractor/Author.java | 6 +- .../mapper/orm/containerextractor/Book.java | 16 ++-- .../ContainerExtractorIT.java | 2 +- .../mapper/orm/directfieldmapping/Book.java | 6 +- .../HibernateOrmSimpleMappingIT.java | 2 +- .../mapper/orm/entityindexmapping/Author.java | 6 +- .../mapper/orm/entityindexmapping/Book.java | 6 +- .../HibernateOrmIndexedIT.java | 2 +- .../mapper/orm/entityindexmapping/User.java | 8 +- .../mapper/orm/entrypoints/Associate.java | 6 +- .../mapper/orm/entrypoints/Book.java | 4 +- .../HibernateOrmEntryPointsIT.java | 4 +- .../mapper/orm/entrypoints/Manager.java | 8 +- .../withhsearch/customanalysis/Author.java | 8 +- .../withhsearch/customanalysis/Book.java | 8 +- .../GettingStartedCustomAnalysisIT.java | 4 +- .../withhsearch/defaultanalysis/Author.java | 8 +- .../withhsearch/defaultanalysis/Book.java | 8 +- .../GettingStartedDefaultAnalysisIT.java | 4 +- .../gettingstarted/withouthsearch/Author.java | 8 +- .../gettingstarted/withouthsearch/Book.java | 8 +- ...ettingStartedWithoutHibernateSearchIT.java | 6 +- .../identifiermapping/customtype/Book.java | 6 +- .../IdentifierMappingCustomTypeIT.java | 2 +- .../orm/identifiermapping/naturalid/Book.java | 6 +- .../IdentifierMappingNaturalIdIT.java | 2 +- .../filteredassociation/Book.java | 10 +-- .../filteredassociation/BookEdition.java | 6 +- .../FilteredAssociationIT.java | 4 +- .../indexedembedded/includepaths/Human.java | 6 +- .../IndexedEmbeddedIncludePathsIT.java | 2 +- .../includepathsanddepth/Human.java | 6 +- ...IndexedEmbeddedIncludePathsAndDepthIT.java | 2 +- .../orm/indexedembedded/none/Author.java | 6 +- .../mapper/orm/indexedembedded/none/Book.java | 6 +- .../none/IndexedEmbeddedNoneIT.java | 2 +- .../orm/indexedembedded/onelevel/Author.java | 6 +- .../orm/indexedembedded/onelevel/Book.java | 6 +- .../onelevel/IndexedEmbeddedOneLevelIT.java | 2 +- .../structure/flattened/Author.java | 6 +- .../structure/flattened/Book.java | 6 +- .../IndexedEmbeddedStructureFlattenedIT.java | 2 +- .../structure/nested/Author.java | 6 +- .../structure/nested/Book.java | 6 +- .../IndexedEmbeddedStructureNestedIT.java | 2 +- .../indexedembedded/twolevels/Address.java | 2 +- .../orm/indexedembedded/twolevels/Author.java | 8 +- .../orm/indexedembedded/twolevels/Book.java | 6 +- .../twolevels/IndexedEmbeddedTwoLevelsIT.java | 2 +- .../mapper/orm/indexedentities/Book.java | 4 +- .../SearchMappingIndexedEntitiesIT.java | 2 +- .../mapper/orm/indexing/Author.java | 6 +- .../mapper/orm/indexing/Book.java | 6 +- .../HibernateOrmAutomaticIndexingIT.java | 2 +- .../indexing/HibernateOrmBatchJsr352IT.java | 10 +-- .../HibernateOrmManualIndexingIT.java | 4 +- .../indexing/HibernateOrmMassIndexerIT.java | 4 +- .../mapper/orm/programmatic/simple/Book.java | 4 +- .../simple/ProgrammaticMappingSimpleIT.java | 2 +- .../AssociationInverseSideIT.java | 2 +- .../associationinverseside/Book.java | 18 ++--- .../associationinverseside/BookEdition.java | 8 +- .../orm/reindexing/derivedfrom/Book.java | 10 +-- .../reindexing/derivedfrom/DerivedFromIT.java | 2 +- .../no/correct/ReindexOnUpdateNoIT.java | 4 +- .../reindexonupdate/no/correct/Sensor.java | 6 +- .../ReindexOnUpdateNoIncorrectIT.java | 4 +- .../reindexonupdate/no/incorrect/Sensor.java | 6 +- .../reindexonupdate/shallow/correct/Book.java | 6 +- .../shallow/correct/BookCategory.java | 4 +- .../correct/ReindexOnUpdateShallowIT.java | 4 +- .../shallow/incorrect/Book.java | 6 +- .../shallow/incorrect/BookCategory.java | 4 +- .../mapper/orm/schema/management/Author.java | 6 +- .../mapper/orm/schema/management/Book.java | 6 +- .../HibernateOrmSchemaManagerIT.java | 4 +- .../orm/spatial/genericfield/Author.java | 8 +- .../genericfield/GeoPointGenericFieldIT.java | 2 +- .../spatial/genericfield/MyCoordinates.java | 4 +- .../geopointbinding/multiple/Author.java | 6 +- .../multiple/GeoPointBindingMultipleIT.java | 2 +- .../geopointbinding/property/Author.java | 8 +- .../property/GeoPointBindingPropertyIT.java | 2 +- .../property/MyCoordinates.java | 4 +- .../spatial/geopointbinding/type/Author.java | 6 +- .../type/GeoPointBindingTypeIT.java | 2 +- .../failurehandler/FailureHandlerIT.java | 6 +- .../search/aggregation/AggregationDslIT.java | 2 +- .../search/aggregation/Book.java | 10 +-- .../search/aggregation/BookEdition.java | 8 +- .../ElasticsearchAggregationDslIT.java | 2 +- .../search/converter/DslConverterIT.java | 10 +-- .../converter/ProjectionConverterIT.java | 12 +-- .../documentation/search/paths/Author.java | 6 +- .../documentation/search/paths/Book.java | 8 +- .../search/paths/FieldPathsIT.java | 2 +- .../search/predicate/Address.java | 4 +- .../search/predicate/Author.java | 8 +- .../documentation/search/predicate/Book.java | 6 +- .../ElasticsearchPredicateDslIT.java | 2 +- .../search/predicate/EmbeddableGeoPoint.java | 4 +- .../predicate/LucenePredicateDslIT.java | 2 +- .../search/predicate/PredicateDslIT.java | 2 +- .../search/projection/Author.java | 8 +- .../documentation/search/projection/Book.java | 6 +- .../ElasticsearchProjectionDslIT.java | 2 +- .../search/projection/EmbeddableGeoPoint.java | 4 +- .../projection/LuceneProjectionDslIT.java | 2 +- .../search/projection/ProjectionDslIT.java | 2 +- .../documentation/search/query/Associate.java | 6 +- .../documentation/search/query/Book.java | 6 +- .../search/query/ElasticsearchQueryDslIT.java | 2 +- .../search/query/LuceneQueryDslIT.java | 2 +- .../documentation/search/query/Manager.java | 12 +-- .../search/query/QueryDslIT.java | 10 +-- .../documentation/search/sort/Author.java | 8 +- .../documentation/search/sort/Book.java | 6 +- .../search/sort/ElasticsearchSortDslIT.java | 2 +- .../search/sort/EmbeddableGeoPoint.java | 4 +- .../search/sort/LuceneSortDslIT.java | 2 +- .../documentation/search/sort/SortDslIT.java | 2 +- .../data/ISBNAttributeConverter.java | 2 +- .../mapper/orm/projection/Author.java | 6 +- .../mapper/orm/projection/Book.java | 6 +- .../ProjectionConstructorMappingJava17IT.java | 2 +- .../projection/ProjectionDslJava17IT.java | 2 +- .../test/resources/META-INF/persistence.xml | 6 +- .../environment/bean/BeanRetrieval.java | 2 +- .../src/main/java/module-info.java | 2 +- .../outboxpolling/entity/Author.java | 6 +- .../AuthorWithSlightlyDifferentIndex.java | 6 +- .../src/main/java/module-info.java | 2 +- .../orm/elasticsearch/entity/Author.java | 6 +- .../AuthorWithSlightlyDifferentIndex.java | 6 +- .../orm-lucene/src/main/java/module-info.java | 2 +- .../modules/orm/lucene/entity/Author.java | 6 +- .../mapper/orm-batch-jsr352/pom.xml | 4 +- .../component/EntityReaderComponentIT.java | 6 +- ...rnateSearchPartitionMapperComponentIT.java | 6 +- .../massindexing/BatchIndexingJobIT.java | 18 ++--- .../EntityManagerFactoryRetrievalIT.java | 8 +- .../MassIndexingJobWithCompositeIdIT.java | 16 ++-- .../MassIndexingJobWithMultiTenancyIT.java | 6 +- .../jsr352/massindexing/RestartChunkIT.java | 20 ++--- .../jsr352/massindexing/entity/Company.java | 6 +- .../massindexing/entity/CompanyGroup.java | 6 +- .../jsr352/massindexing/entity/Person.java | 4 +- .../jsr352/massindexing/entity/WhoAmI.java | 4 +- .../batch/jsr352/util/JobTestUtil.java | 14 ++-- .../src/test/resources/META-INF/batch.xml | 2 +- .../test/resources/META-INF/persistence.xml | 4 +- integrationtest/mapper/orm-cdi/pom.xml | 6 +- .../mapper/orm/cdi/CdiBeanResolutionIT.java | 20 ++--- ...xtendedBeanManagerBootstrapShutdownIT.java | 12 +-- .../orm/cdi/StubExtendedBeanManager.java | 4 +- .../OutboxPollingDisabledIT.java | 8 +- .../OutboxPollingStrategyPropertyValueIT.java | 6 +- ...lingAutomaticIndexingBackendFailureIT.java | 6 +- ...PollingAutomaticIndexingConcurrencyIT.java | 4 +- ...cIndexingDynamicShardingRebalancingIT.java | 4 +- ...oxPollingAutomaticIndexingEdgeCasesIT.java | 8 +- ...ollingAutomaticIndexingEventSendingIT.java | 6 +- ...tomaticIndexingInvalidConfigurationIT.java | 4 +- ...oxPollingAutomaticIndexingLifecycleIT.java | 6 +- ...ollingAutomaticIndexingMultiTenancyIT.java | 4 +- ...llingAutomaticIndexingOutOfOrderIdsIT.java | 6 +- ...ollingAutomaticIndexingShardingBaseIT.java | 6 +- ...icShardingIncompatibleConfigurationIT.java | 4 +- ...gStaticShardingInvalidConfigurationIT.java | 4 +- ...cIndexingStaticShardingUnevenShardsIT.java | 4 +- ...gAutomaticIndexingWhileMassIndexingIT.java | 4 +- .../OutboxPollingCustomEntityMappingIT.java | 6 +- .../RoutedIndexedEntity.java | 4 +- .../searchmapping/IndexedEntity.java | 6 +- integrationtest/mapper/orm-envers/pom.xml | 2 +- .../mapper/orm/envers/EnversIT.java | 8 +- ...tectMultipleBackendTypesInClasspathIT.java | 4 +- ...oDetectSingleBackendTypeInClasspathIT.java | 4 +- .../bootstrap/BeanResolutionIT.java | 8 +- .../ConcurrentEmbeddedUpdateLimitationIT.java | 12 +-- .../MassIndexingManualSchemaManagementIT.java | 2 +- .../massindexing/MassIndexingMonitorIT.java | 2 +- .../RealBackendDatabaseMultitenancyIT.java | 4 +- .../RoutingBridgeConditionalIndexingIT.java | 8 +- .../routing/RoutingBridgeRoutingKeyIT.java | 8 +- .../realbackend/sync/OutOfSyncIndexIT.java | 2 +- .../mapper/orm/realbackend/util/Book.java | 4 +- .../realbackend/util/BookCreatorUtils.java | 2 +- .../SpringBeanResolutionIT.java | 10 +-- .../spring/jta/JtaAndSpringIT.java | 2 +- .../spring/jta/JtaAndSpringMoreComplexIT.java | 2 +- .../spring/jta/JtaAndSpringOutboxIT.java | 2 +- .../spring/jta/dao/BoxDAO.java | 4 +- .../spring/jta/dao/SnertDAO.java | 4 +- .../spring/jta/entity/AbstractEntity.java | 4 +- .../spring/jta/entity/Box.java | 8 +- .../spring/jta/entity/Container.java | 16 ++-- .../spring/jta/entity/Doughnut.java | 10 +-- .../spring/jta/entity/Muffin.java | 10 +-- .../spring/jta/entity/Snert.java | 8 +- .../RaisedTimeoutJtaAndSpringOutboxIT.java | 2 +- ...ransactionTimeoutJtaAndSpringOutboxIT.java | 2 +- .../spring/outbox/TransactionOutboxIT.java | 6 +- .../spring/sessionproxy/SessionProxyIT.java | 6 +- .../spring/transaction/TransactionIT.java | 6 +- .../AutomaticIndexingBasicIT.java | 6 +- ...ncurrentModificationInDifferentTypeIT.java | 8 +- ...ingConcurrentModificationInSameTypeIT.java | 8 +- .../AutomaticIndexingElementCollectionIT.java | 12 +-- .../AutomaticIndexingEmbeddableIT.java | 30 +++---- .../AutomaticIndexingEnabledIT.java | 6 +- .../AutomaticIndexingMappedSuperclassIT.java | 14 ++-- .../AutomaticIndexingMultiTenancyIT.java | 4 +- ...omaticIndexingNonEntityIdDocumentIdIT.java | 10 +-- .../AutomaticIndexingOverReindexingIT.java | 8 +- ...ingRoutingBridgeConditionalIndexingIT.java | 6 +- ...aticIndexingRoutingBridgeRoutingKeyIT.java | 6 +- .../AutomaticIndexingBooleanArrayIT.java | 8 +- .../array/AutomaticIndexingByteArrayIT.java | 8 +- .../array/AutomaticIndexingCharArrayIT.java | 8 +- .../array/AutomaticIndexingDoubleArrayIT.java | 8 +- .../array/AutomaticIndexingFloatArrayIT.java | 8 +- .../array/AutomaticIndexingIntArrayIT.java | 8 +- .../array/AutomaticIndexingLongArrayIT.java | 8 +- .../array/AutomaticIndexingShortArrayIT.java | 8 +- .../array/AutomaticIndexingStringArrayIT.java | 8 +- ...utomaticIndexingAssociationDeletionIT.java | 26 +++--- ...dexingGenericPolymorphicAssociationIT.java | 16 ++-- ...ngPolymorphicInverseSideAssociationIT.java | 16 ++-- ...gPolymorphicOriginalSideAssociationIT.java | 18 ++--- ...oManyOwnedByContainedCollectionBaseIT.java | 28 +++---- ...gManyToManyOwnedByContainedListBaseIT.java | 28 +++---- ...ManyOwnedByContainingCollectionBaseIT.java | 28 +++---- ...ManyToManyOwnedByContainingListBaseIT.java | 28 +++---- ...yToManyOwnedByContainingMapKeysBaseIT.java | 32 ++++---- ...oManyOwnedByContainingMapValuesBaseIT.java | 30 +++---- ...wnedByContainingSortedMapValuesBaseIT.java | 30 +++---- ...oManyOwnedByContainingSortedSetBaseIT.java | 28 +++---- .../AutomaticIndexingManyToOneBaseIT.java | 32 ++++---- ...aticIndexingOneToManyCollectionBaseIT.java | 30 +++---- .../AutomaticIndexingOneToManyListBaseIT.java | 30 +++---- ...OneOwnedByContainedEagerOnBothSidesIT.java | 22 ++--- ...OwnedByContainedLazyOnContainedSideIT.java | 24 +++--- ...wnedByContainedLazyOnContainingSideIT.java | 24 +++--- ...neOwnedByContainingEagerOnBothSidesIT.java | 24 +++--- ...wnedByContainingLazyOnContainedSideIT.java | 26 +++--- ...nedByContainingLazyOnContainingSideIT.java | 26 +++--- .../AbstractAutomaticIndexingBridgeIT.java | 16 ++-- ...gBridgeExplicitReindexingFunctionalIT.java | 6 +- .../AutomaticIndexingEmbeddedBridgeIT.java | 14 ++-- ...edInThroughNonContainingIndexedTypeIT.java | 6 +- ...UnnecessaryCollectionInitializationIT.java | 8 +- ...ingProcessorProxiedAssociatedEntityIT.java | 16 ++-- ...xingResolverProxiedAssociatedEntityIT.java | 18 ++--- .../AutomaticIndexingIdentiferRollbackIT.java | 6 +- .../AutomaticIndexingOutOfTransactionIT.java | 4 +- .../AutomaticIndexingSessionFlushIT.java | 4 +- ...aticIndexingSynchronizationStrategyIT.java | 6 +- .../session/FlushClearEvictAllIT.java | 26 +++--- .../orm/bootstrap/BootstrapFailureIT.java | 6 +- .../mapper/orm/bootstrap/BootstrapLogsIT.java | 6 +- .../HibernateOrmIntegrationBooterIT.java | 4 +- .../orm/bootstrap/ObsoletePropertiesIT.java | 6 +- .../orm/bootstrap/ShutdownFailureIT.java | 4 +- .../orm/bootstrap/UnusedPropertiesIT.java | 6 +- .../ToHibernateOrmQueryIT.java | 16 ++-- .../ToHibernateOrmScrollableResultsIT.java | 8 +- .../ToHibernateOrmSessionIT.java | 4 +- .../ToJpaEntityManagerIT.java | 6 +- .../orm/hibernateormapis/ToJpaQueryIT.java | 36 ++++----- .../ToSearchSessionFromSessionProxyIT.java | 4 +- .../mapper/orm/mapping/SearchMappingIT.java | 8 +- .../SearchMappingNoDefaultBackendIT.java | 8 +- .../AnnotationMappingDiscoveryIT.java | 10 +-- ...HibernateOrmSearchMappingConfigurerIT.java | 4 +- .../AbstractMassIndexingErrorIT.java | 4 +- .../AbstractMassIndexingFailureIT.java | 4 +- .../orm/massindexing/MassIndexingBaseIT.java | 6 +- .../massindexing/MassIndexingCachingIT.java | 8 +- .../MassIndexingComplexHierarchyIT.java | 4 +- .../MassIndexingConditionalExpressionsIT.java | 10 +-- .../MassIndexingEmbeddedIdIT.java | 8 +- .../massindexing/MassIndexingIdClassIT.java | 6 +- .../MassIndexingInterruptionIT.java | 6 +- .../massindexing/MassIndexingMonitorIT.java | 6 +- .../MassIndexingNonEntityIdDocumentIdIT.java | 6 +- .../MassIndexingPrimitiveIdIT.java | 6 +- .../model/AnnotationMappingAccessTypeIT.java | 30 +++---- .../mapper/orm/model/BackRefPropertyIT.java | 12 +-- .../BindingUsingPropertyMarkerAccessIT.java | 4 +- .../orm/model/BytecodeEnhancementIT.java | 24 +++--- .../model/DefaultDecimalScaleMappingIT.java | 6 +- .../orm/model/FilteredAssociationIT.java | 10 +-- .../mapper/orm/model/GenericPropertyIT.java | 10 +-- .../mapper/orm/model/IdClassIT.java | 6 +- .../orm/model/IdDerivedFromAssociationIT.java | 12 +-- .../mapper/orm/model/JpaIdAsDocumentIdIT.java | 10 +-- .../mapper/orm/model/MappedSuperclassIT.java | 6 +- .../ProgrammaticMappingAccessTypeIT.java | 30 +++---- .../orm/model/PropertyInheritanceIT.java | 8 +- .../mapper/orm/model/ProxyIT.java | 6 +- .../mapper/orm/model/SyntheticPropertyIT.java | 10 +-- .../mapper/orm/model/TransientPropertyIT.java | 8 +- .../mapper/orm/multitenancy/Clock.java | 4 +- ...tSearchSchemaManagerSimpleOperationIT.java | 4 +- .../AbstractSchemaManagementStrategyIT.java | 4 +- .../SchemaManagementStrategyNoneIT.java | 4 +- .../mapper/orm/scope/ScopeExtensionIT.java | 4 +- .../mapper/orm/search/SearchQueryBaseIT.java | 8 +- .../SearchQueryEntityChangingScrollingIT.java | 4 +- ...SearchQueryEntityLoadingCacheLookupIT.java | 2 +- ...archQueryEntityLoadingMultipleTypesIT.java | 2 +- ...eryEntityLoadingNonUniqueDocumentIdIT.java | 4 +- .../model/multipletypes/Hierarchy1_A_B.java | 2 +- .../model/multipletypes/Hierarchy1_A_C.java | 2 +- .../multipletypes/Hierarchy1_A__Abstract.java | 4 +- .../model/multipletypes/Hierarchy2_A_B.java | 2 +- .../model/multipletypes/Hierarchy2_A_C.java | 2 +- .../Hierarchy2_A__NonAbstract_Indexed.java | 4 +- .../model/multipletypes/Hierarchy3_A_B.java | 2 +- .../model/multipletypes/Hierarchy3_A_C.java | 2 +- .../Hierarchy3_A__NonAbstract_NonIndexed.java | 4 +- .../Hierarchy4_A_B__integer1DocumentId.java | 2 +- .../Hierarchy4_A_C__integer2DocumentId.java | 2 +- .../model/multipletypes/Hierarchy4_A_D.java | 2 +- .../Hierarchy4_A__NonAbstract_NonIndexed.java | 4 +- .../model/multipletypes/Hierarchy5_A_B_C.java | 2 +- .../model/multipletypes/Hierarchy5_A_B_D.java | 2 +- .../Hierarchy5_A_B__MappedSuperClass.java | 2 +- .../multipletypes/Hierarchy5_A__Abstract.java | 4 +- .../Hierarchy6_A_B_Cacheable.java | 4 +- .../Hierarchy6_A_C_Cacheable.java | 4 +- .../multipletypes/Hierarchy6_A__Abstract.java | 4 +- .../model/multipletypes/Hierarchy7_A_B.java | 2 +- .../model/multipletypes/Hierarchy7_A_C.java | 2 +- .../model/multipletypes/Hierarchy7_A_D.java | 2 +- .../multipletypes/Hierarchy7_A__Abstract.java | 4 +- .../Hierarchy8_A_B_Cacheable.java | 4 +- .../Hierarchy8_A_C_Cacheable.java | 4 +- .../Hierarchy8_A_D_Cacheable.java | 4 +- .../multipletypes/Hierarchy8_A__Abstract.java | 4 +- .../singletype/BasicContainedEntity.java | 8 +- .../model/singletype/BasicIndexedEntity.java | 14 ++-- .../FetchSubSelectContainedEntity.java | 8 +- .../FetchSubSelectIndexedEntity.java | 14 ++-- .../orm/session/SearchIndexingPlanBaseIT.java | 8 +- ...chIndexingPlanNonEntityIdDocumentIdIT.java | 4 +- ...rchIndexingPlanPersistBatchIndexingIT.java | 4 +- .../orm/smoke/AnnotationMappingSmokeIT.java | 18 ++--- .../orm/smoke/ProgrammaticMappingSmokeIT.java | 18 ++--- .../orm/spi/DifferentSessionFactoriesIT.java | 6 +- ...tractSearchWorkspaceSimpleOperationIT.java | 4 +- .../orm/model/IndexedEmbeddedRecordIT.java | 10 +-- .../ISBNAttributeConverter.java | 2 +- .../library/model/AbstractEntity.java | 2 +- .../showcase/library/model/Account.java | 12 +-- .../showcase/library/model/Book.java | 6 +- .../showcase/library/model/BookCopy.java | 2 +- .../showcase/library/model/Borrowal.java | 10 +-- .../showcase/library/model/Document.java | 12 +-- .../showcase/library/model/DocumentCopy.java | 16 ++-- .../showcase/library/model/Library.java | 12 +-- .../showcase/library/model/Person.java | 8 +- .../showcase/library/model/Video.java | 2 +- .../showcase/library/model/VideoCopy.java | 2 +- .../IndexSearchDocumentRepositoryImpl.java | 2 +- .../IndexSearchLibraryRepositoryImpl.java | 2 +- .../IndexSearchPersonRepositoryImpl.java | 2 +- .../library/service/AdminService.java | 2 +- .../library/service/Java17Service.java | 2 +- .../library/service/TestDataService.java | 4 +- integrationtest/v5migrationhelper/orm/pom.xml | 4 +- .../orm/src/test/java/NotPackagedEntity.java | 6 +- .../org/hibernate/search/test/Document.java | 6 +- .../hibernate/search/test/backend/Clock.java | 4 +- .../test/batchindexing/AncientBook.java | 6 +- .../search/test/batchindexing/Book.java | 10 +-- .../search/test/batchindexing/Clock.java | 4 +- .../test/batchindexing/ConcurrentData.java | 6 +- .../search/test/batchindexing/Dvd.java | 10 +-- .../batchindexing/ExtendedIssueEntity.java | 2 +- .../IndexedEmbeddedProxyLazyEntity.java | 8 +- .../IndexedEmbeddedProxyRootEntity.java | 10 +-- .../test/batchindexing/IssueEntity.java | 4 +- .../search/test/batchindexing/LegacyCar.java | 12 +-- .../test/batchindexing/LegacyCarPlant.java | 12 +-- .../search/test/batchindexing/LegacyTire.java | 14 ++-- .../search/test/batchindexing/Nation.java | 10 +-- .../search/test/batchindexing/SecretBook.java | 2 +- .../WeirdlyIdentifiedEntity.java | 6 +- .../search/test/bridge/ArrayBridgeTest.java | 2 +- .../test/bridge/ArrayBridgeTestEntity.java | 18 ++--- .../hibernate/search/test/bridge/Cloud.java | 6 +- .../search/test/bridge/Gangster.java | 4 +- .../test/bridge/IterableBridgeTest.java | 2 +- .../test/bridge/IterableBridgeTestEntity.java | 16 ++-- .../search/test/bridge/MapBridgeTest.java | 2 +- .../test/bridge/MapBridgeTestEntity.java | 18 ++--- .../test/configuration/ClassLevelTestPoI.java | 6 +- .../test/configuration/Departments.java | 6 +- .../DynamicBoostedDescLibrary.java | 6 +- .../test/configuration/LatLongAnnTestPoi.java | 6 +- .../search/test/configuration/LobTest.java | 8 +- .../configuration/MemberLevelTestPoI.java | 6 +- .../test/configuration/ProvidedIdEntry.java | 6 +- .../configuration/field/TokenizationTest.java | 6 +- .../ManualIndexingStrategyTest.java | 8 +- .../search/test/embedded/AbstractProduct.java | 10 +-- .../search/test/embedded/Address.java | 14 ++-- .../search/test/embedded/Author.java | 6 +- .../hibernate/search/test/embedded/Book.java | 2 +- .../ContainedInEntityInheritanceTest.java | 10 +-- .../search/test/embedded/Country.java | 12 +-- .../test/embedded/NonIndexedEntity.java | 6 +- .../hibernate/search/test/embedded/Order.java | 8 +- .../hibernate/search/test/embedded/Owner.java | 2 +- .../search/test/embedded/Product.java | 12 +-- .../search/test/embedded/ProductFeature.java | 8 +- .../search/test/embedded/Resident.java | 2 +- .../hibernate/search/test/embedded/State.java | 10 +-- .../search/test/embedded/StateCandidate.java | 10 +-- .../hibernate/search/test/embedded/Tower.java | 10 +-- .../test/embedded/doubleinsert/Address.java | 16 ++-- .../doubleinsert/BusinessContact.java | 6 +- .../test/embedded/doubleinsert/Contact.java | 28 +++---- .../doubleinsert/PersonalContact.java | 6 +- .../test/embedded/doubleinsert/Phone.java | 16 ++-- .../fieldoncollection/IndexedEntity.java | 14 ++-- .../search/test/embedded/graph/Event.java | 8 +- .../embedded/graph/ParentOfBirthEvent.java | 10 +-- .../search/test/embedded/graph/Person.java | 12 +-- .../search/test/embedded/nested/Address.java | 8 +- .../test/embedded/nested/Attribute.java | 14 ++-- .../test/embedded/nested/AttributeValue.java | 12 +-- .../search/test/embedded/nested/Person.java | 10 +-- .../search/test/embedded/nested/Place.java | 12 +-- .../search/test/embedded/nested/Product.java | 12 +-- .../nested/containedIn/Entity1ForDoc0.java | 14 ++-- .../containedIn/Entity1ForUnindexed.java | 14 ++-- .../nested/containedIn/Entity2ForDoc0.java | 16 ++-- .../containedIn/Entity2ForUnindexed.java | 14 ++-- .../embedded/nested/containedIn/HelpItem.java | 14 ++-- .../nested/containedIn/HelpItemTag.java | 16 ++-- .../test/embedded/nested/containedIn/Tag.java | 16 ++-- .../search/test/embedded/path/Human.java | 12 +-- .../embedded/path/defaultdepth/EntityA.java | 8 +- .../embedded/path/defaultdepth/EntityB.java | 8 +- .../embedded/path/defaultdepth/EntityC.java | 8 +- .../test/embedded/path/depth/EntityA.java | 8 +- .../test/embedded/path/depth/EntityB.java | 8 +- .../test/embedded/path/depth/EntityC.java | 8 +- .../test/embedded/path/multiple/EntityA.java | 8 +- .../test/embedded/path/multiple/EntityB.java | 8 +- .../test/embedded/path/multiple/EntityC.java | 8 +- .../test/embedded/path/prefixed/EntityA.java | 8 +- .../test/embedded/path/prefixed/EntityB.java | 8 +- .../test/embedded/path/prefixed/EntityC.java | 8 +- .../test/embedded/path/renamed/EntityA.java | 8 +- .../test/embedded/path/renamed/EntityB.java | 8 +- .../test/embedded/path/renamed/EntityC.java | 8 +- .../test/embedded/path/simple/EntityA.java | 8 +- .../test/embedded/path/simple/EntityB.java | 8 +- .../test/embedded/path/simple/EntityC.java | 8 +- .../test/embedded/path/validation/A.java | 8 +- .../test/embedded/path/validation/B.java | 8 +- .../test/embedded/path/validation/C.java | 8 +- .../validation/DeepPathSimpleTypeCase.java | 8 +- .../DeepPathWithLeadingPrefixCase.java | 8 +- .../validation/DepthExceedsPathTestCase.java | 8 +- .../validation/DepthMatchesPathDepthCase.java | 8 +- .../embedded/path/validation/Embedded.java | 6 +- .../FieldRenamedContainerEntity.java | 8 +- .../FieldRenamedEmbeddedEntity.java | 8 +- .../InvalidEmbeddedNonLeafCase.java | 8 +- .../validation/InvalidEmbeddedPathCase.java | 8 +- .../InvalidEmbeddedWithoutPathsCase.java | 6 +- .../path/validation/InvalidPrefixCase.java | 8 +- .../validation/InvalidShallowPathCase.java | 8 +- .../path/validation/PathNotIndexedCase.java | 8 +- .../embedded/path/validation/ReferencesC.java | 8 +- .../ReferencesIndexedEmbeddedA.java | 8 +- ...rphicAssociationContainedInTargetTest.java | 8 +- ...ymorphicAssociationPropertyAccessTest.java | 10 +-- .../uninitializedproxy/AbstractEntity.java | 8 +- .../uninitializedproxy/ConcreteEntity.java | 4 +- .../LazyAbstractEntityReference.java | 12 +-- .../search/test/embedded/sorting/Hero.java | 6 +- .../search/test/embedded/sorting/Villain.java | 8 +- .../search/test/embedded/update/Dad.java | 12 +-- .../search/test/embedded/update/Grandpa.java | 6 +- .../test/embedded/update/ProductArticle.java | 12 +-- .../test/embedded/update/ProductModel.java | 16 ++-- .../embedded/update/ProductReferenceCode.java | 10 +-- .../embedded/update/ProductShootingBrief.java | 12 +-- .../embedded/update/SimpleChildEntity.java | 8 +- .../embedded/update/SimpleParentEntity.java | 8 +- .../search/test/embedded/update/Son.java | 8 +- .../UpdateIndexedEmbeddedCollectionTest.java | 12 +-- .../hibernate/search/test/engine/BusLine.java | 10 +-- .../hibernate/search/test/engine/BusStop.java | 12 +-- .../TransactionSynchronizationTest.java | 10 +-- .../test/engine/TransientFieldsDirtyTest.java | 10 +-- .../search/test/engine/indexapi/Author.java | 6 +- .../search/test/engine/indexapi/Book.java | 8 +- .../search/test/engine/indexapi/Clock.java | 4 +- .../search/test/engine/indexapi/Leaf.java | 8 +- .../search/test/engine/indexapi/Tree.java | 10 +-- .../search/test/engine/worker/Employee.java | 6 +- .../search/test/engine/worker/Employer.java | 6 +- .../hibernate/search/test/envers/Address.java | 8 +- .../hibernate/search/test/envers/Person.java | 8 +- .../event/update/CheeseRollingCompetitor.java | 4 +- .../search/test/fieldAccess/Document.java | 6 +- .../org/hibernate/search/test/id/Animal.java | 6 +- .../org/hibernate/search/test/id/Article.java | 6 +- .../search/test/inheritance/Animal.java | 6 +- .../search/test/inheritance/Being.java | 2 +- .../search/test/inheritance/Bird.java | 2 +- .../search/test/inheritance/Eagle.java | 2 +- .../search/test/inheritance/Fish.java | 2 +- .../search/test/inheritance/Mammal.java | 2 +- .../hibernate/search/test/jpa/Bretzel.java | 6 +- .../search/test/jpa/JPATestCase.java | 4 +- .../search/test/jpa/ToStringTest.java | 6 +- .../hibernate/search/test/proxy/Author.java | 10 +-- .../org/hibernate/search/test/proxy/Book.java | 8 +- .../hibernate/search/test/proxy/Comment.java | 16 ++-- .../hibernate/search/test/proxy/Profile.java | 10 +-- .../search/test/query/AlternateBook.java | 4 +- .../hibernate/search/test/query/Author.java | 6 +- .../org/hibernate/search/test/query/Book.java | 10 +-- .../hibernate/search/test/query/Clock.java | 4 +- .../test/query/ElectricalProperties.java | 4 +- .../hibernate/search/test/query/Employee.java | 4 +- .../search/test/query/FootballTeam.java | 4 +- .../hibernate/search/test/query/Husband.java | 10 +-- .../search/test/query/LuceneQueryTest.java | 4 +- .../hibernate/search/test/query/Music.java | 14 ++-- .../query/ObjectLoadingPublicFieldTest.java | 6 +- .../hibernate/search/test/query/Person.java | 6 +- .../search/test/query/ProductArticle.java | 8 +- .../hibernate/search/test/query/Spouse.java | 6 +- .../search/test/query/explain/Dvd.java | 6 +- .../search/test/query/facet/Author.java | 6 +- .../search/test/query/facet/Book.java | 8 +- .../search/test/query/facet/Car.java | 6 +- .../hibernate/search/test/query/facet/Cd.java | 6 +- .../search/test/query/facet/Company.java | 10 +-- .../test/query/facet/CompanyFacility.java | 8 +- .../search/test/query/facet/Fruit.java | 6 +- .../search/test/query/facet/Ingredient.java | 6 +- .../search/test/query/facet/Recipe.java | 8 +- .../search/test/query/facet/Truck.java | 6 +- .../test/query/initandlookup/Kernel.java | 8 +- .../query/initandlookup/StrictKernel.java | 8 +- .../search/test/query/nullValues/Value.java | 10 +-- .../objectloading/mixedhierarchy/College.java | 12 +-- .../mixedhierarchy/CommunityCollege.java | 2 +- .../EducationalInstitution.java | 2 +- .../mixedhierarchy/HighSchool.java | 4 +- .../mixedhierarchy/PrimarySchool.java | 4 +- .../objectloading/mixedhierarchy/School.java | 6 +- .../mixedhierarchy/University.java | 4 +- .../search/test/query/sorting/BrickLayer.java | 4 +- .../search/test/query/sorting/SortTest.java | 6 +- .../sorting/SortUsingEntityManagerTest.java | 2 +- .../search/test/query/timeout/Clock.java | 4 +- .../test/query/timeout/JPATimeoutTest.java | 4 +- .../test/query/timeout/TimeoutTest.java | 2 +- .../query/validation/QueryValidationTest.java | 8 +- .../search/test/session/Categorie.java | 6 +- .../hibernate/search/test/session/Domain.java | 4 +- .../hibernate/search/test/session/Email.java | 8 +- .../hibernate/search/test/session/Entite.java | 10 +-- .../search/test/spatial/DoubleIndexedPOI.java | 6 +- .../hibernate/search/test/spatial/Event.java | 6 +- .../search/test/spatial/GetterUser.java | 4 +- .../hibernate/search/test/spatial/Hotel.java | 4 +- .../test/spatial/MissingSpatialPOI.java | 4 +- .../search/test/spatial/NonGeoPOI.java | 4 +- .../hibernate/search/test/spatial/POI.java | 6 +- .../search/test/spatial/Position.java | 2 +- .../search/test/spatial/RangeEvent.java | 6 +- .../search/test/spatial/RangeHotel.java | 4 +- .../search/test/spatial/Restaurant.java | 4 +- .../test/spatial/SpatialContainedInTest.java | 8 +- ...tialSearchSortByDistanceAndPagingTest.java | 12 +-- .../hibernate/search/test/spatial/User.java | 6 +- .../hibernate/search/test/spatial/UserEx.java | 4 +- .../search/test/spatial/UserRange.java | 4 +- .../V5MigrationHelperJPASetupHelper.java | 2 +- .../test/util/ResourceCleanupFunctions.java | 6 +- .../test/resources/META-INF/persistence.xml | 2 +- jakarta/ant-copy-and-transform-sources.xml | 80 ------------------- javaee/ant-copy-and-transform-sources.xml | 53 ++++++++++++ .../build/parents/integrationtest/pom.xml | 22 ++--- .../build/parents/internal/pom.xml | 22 ++--- .../build/parents/public/pom.xml | 10 +-- {jakarta => javaee}/documentation/pom.xml | 16 ++-- .../pom.xml | 12 +-- .../java/modules/orm-elasticsearch/pom.xml | 10 +-- .../java/modules/orm-lucene/pom.xml | 10 +-- .../mapper/orm-batch-jsr352/pom.xml | 30 +++---- .../integrationtest/mapper/orm-cdi/pom.xml | 16 ++-- .../orm-coordination-outbox-polling/pom.xml | 16 ++-- .../integrationtest/mapper/orm-envers/pom.xml | 14 ++-- .../mapper/orm-realbackend/pom.xml | 14 ++-- .../integrationtest/mapper/orm/pom.xml | 12 +-- {jakarta => javaee}/integrationtest/pom.xml | 8 +- .../v5migrationhelper/orm/pom.xml | 16 ++-- .../mapper/orm-batch-jsr352/core/pom.xml | 20 ++--- .../mapper/orm-batch-jsr352/jberet/pom.xml | 18 ++--- .../orm-coordination-outbox-polling/pom.xml | 12 +-- {jakarta => javaee}/mapper/orm/pom.xml | 49 +++++------- {jakarta => javaee}/pom.xml | 6 +- .../integrationtest/jbatch-runtime/pom.xml | 14 ++-- .../integrationtest/jberet-se/pom.xml | 8 +- .../integrationtest/mapper/orm/pom.xml | 16 ++-- .../util/internal/integrationtest/pom.xml | 6 +- .../util/internal/test/orm/pom.xml | 14 ++-- .../v5migrationhelper/orm/pom.xml | 10 +-- mapper/orm-batch-jsr352/core/pom.xml | 8 +- .../impl/ActiveSessionFactoryRegistry.java | 2 +- .../jpa/spi/EntityManagerFactoryRegistry.java | 2 +- .../scope/spi/HibernateSearchJobScoped.java | 2 +- .../spi/HibernateSearchPartitionScoped.java | 2 +- .../core/massindexing/MassIndexingJob.java | 2 +- .../massindexing/impl/JobContextData.java | 2 +- .../spi/JobContextSetupListener.java | 10 +-- .../afterchunk/impl/AfterChunkBatchlet.java | 10 +-- .../beforechunk/impl/BeforeChunkBatchlet.java | 10 +-- .../massindexing/step/impl/EntityWriter.java | 12 +-- .../impl/HibernateSearchPartitionMapper.java | 26 +++--- .../step/impl/ProgressAggregator.java | 6 +- .../step/impl/ProgressCollector.java | 6 +- .../step/impl/StepProgressSetupListener.java | 16 ++-- .../massindexing/step/spi/EntityReader.java | 24 +++--- .../util/impl/CompositeIdOrder.java | 14 ++-- .../core/massindexing/util/impl/IdOrder.java | 8 +- .../util/impl/JobContextUtil.java | 4 +- .../util/impl/PartitionBound.java | 2 +- .../util/impl/PersistenceUtil.java | 2 +- .../util/impl/SingularIdOrder.java | 8 +- .../util/impl/ValidationUtil.java | 2 +- .../hibernate-search-mass-indexing.xml | 4 +- mapper/orm-batch-jsr352/jberet/pom.xml | 10 +-- .../JBeretEntityManagerFactoryRegistry.java | 28 +++---- .../impl/HibernateSearchJsr352Extension.java | 20 ++--- .../src/main/resources/META-INF/beans.xml | 4 +- .../outboxpolling/cluster/impl/Agent.java | 2 +- .../outboxpolling/event/impl/OutboxEvent.java | 2 +- .../event/impl/OutboxEventLoader.java | 2 +- .../outboxpolling/logging/impl/Log.java | 2 +- mapper/orm/pom.xml | 36 ++++++--- .../hibernate/search/mapper/orm/Search.java | 6 +- .../impl/ExtendedBeanManagerSynchronizer.java | 2 +- .../mapper/orm/common/EntityReference.java | 2 +- .../orm/common/impl/HibernateOrmUtils.java | 4 +- .../orm/common/spi/TransactionHelper.java | 14 ++-- .../orm/entity/SearchIndexedEntity.java | 2 +- ...ractHibernateOrmSelectionEntityLoader.java | 4 +- .../impl/CriteriaTypeQueryFactory.java | 12 +-- .../HibernateOrmSelectionLoadingContext.java | 2 +- .../loading/impl/LoadingMappingContext.java | 2 +- .../mapper/orm/mapping/SearchMapping.java | 4 +- .../orm/mapping/impl/HibernateOrmMapping.java | 4 +- ...ibernateOrmMassIndexingMappingContext.java | 2 +- .../impl/HibernateOrmPathInterpreter.java | 2 +- .../impl/HibernateOrmScopeMappingContext.java | 2 +- .../loading/dsl/SearchLoadingOptionsStep.java | 4 +- .../impl/HibernateOrmSearchQueryAdapter.java | 10 +-- ...nateOrmSearchScrollableResultsAdapter.java | 2 +- .../mapper/orm/session/SearchSession.java | 4 +- ...fterCommitIndexingPlanSynchronization.java | 4 +- ...foreCommitIndexingPlanSynchronization.java | 4 +- .../ConfiguredAutomaticIndexingStrategy.java | 2 +- .../session/impl/DelegatingSearchSession.java | 2 +- .../impl/HibernateOrmSearchSession.java | 4 +- .../impl/HibernateOrmSearchSessionHolder.java | 2 +- .../session/impl/SynchronizationAdapter.java | 4 +- .../mapper/orm/spi/BatchMappingContext.java | 2 +- .../mapper/orm/work/SearchIndexingPlan.java | 2 +- ...rmBootstrapIntrospectorAccessTypeTest.java | 24 +++--- ...trapIntrospectorAnnotationReadingTest.java | 4 +- pom.xml | 63 +++++++++++---- .../integrationtest/jbatch-runtime/pom.xml | 10 +-- .../integrationtest/jberet-se/pom.xml | 20 ++--- .../integrationtest/mapper/orm/pom.xml | 4 +- .../mapper/orm/HibernateOrmMappingHandle.java | 2 +- .../mapper/orm/JPAPersistenceRunner.java | 6 +- .../integrationtest/mapper/orm/OrmUtils.java | 6 +- .../mapper/orm/PersistenceRunner.java | 4 +- .../mapper/orm/ReusableOrmSetupHolder.java | 18 ++--- .../SimpleEntityManagerFactoryBuilder.java | 4 +- .../integrationtest/v5migrationhelper/pom.xml | 6 +- util/internal/test/orm/pom.xml | 2 +- .../org/hibernate/search/FullTextQuery.java | 4 +- .../search/FullTextSharedSessionBuilder.java | 2 +- .../org/hibernate/search/SearchFactory.java | 8 +- .../search/jpa/FullTextEntityManager.java | 2 +- .../hibernate/search/jpa/FullTextQuery.java | 10 +-- .../java/org/hibernate/search/jpa/Search.java | 4 +- .../hibernate/impl/FullTextQueryImpl.java | 12 +-- 822 files changed, 3099 insertions(+), 3084 deletions(-) delete mode 100644 jakarta/ant-copy-and-transform-sources.xml create mode 100644 javaee/ant-copy-and-transform-sources.xml rename {jakarta => javaee}/build/parents/integrationtest/pom.xml (93%) rename {jakarta => javaee}/build/parents/internal/pom.xml (94%) rename {jakarta => javaee}/build/parents/public/pom.xml (95%) rename {jakarta => javaee}/documentation/pom.xml (93%) rename {jakarta => javaee}/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml (91%) rename {jakarta => javaee}/integrationtest/java/modules/orm-elasticsearch/pom.xml (92%) rename {jakarta => javaee}/integrationtest/java/modules/orm-lucene/pom.xml (92%) rename {jakarta => javaee}/integrationtest/mapper/orm-batch-jsr352/pom.xml (92%) rename {jakarta => javaee}/integrationtest/mapper/orm-cdi/pom.xml (85%) rename {jakarta => javaee}/integrationtest/mapper/orm-coordination-outbox-polling/pom.xml (93%) rename {jakarta => javaee}/integrationtest/mapper/orm-envers/pom.xml (86%) rename {jakarta => javaee}/integrationtest/mapper/orm-realbackend/pom.xml (94%) rename {jakarta => javaee}/integrationtest/mapper/orm/pom.xml (88%) rename {jakarta => javaee}/integrationtest/pom.xml (80%) rename {jakarta => javaee}/integrationtest/v5migrationhelper/orm/pom.xml (91%) rename {jakarta => javaee}/mapper/orm-batch-jsr352/core/pom.xml (81%) rename {jakarta => javaee}/mapper/orm-batch-jsr352/jberet/pom.xml (86%) rename {jakarta => javaee}/mapper/orm-coordination-outbox-polling/pom.xml (94%) rename {jakarta => javaee}/mapper/orm/pom.xml (71%) rename {jakarta => javaee}/pom.xml (86%) rename {jakarta => javaee}/util/internal/integrationtest/jbatch-runtime/pom.xml (86%) rename {jakarta => javaee}/util/internal/integrationtest/jberet-se/pom.xml (95%) rename {jakarta => javaee}/util/internal/integrationtest/mapper/orm/pom.xml (86%) rename {jakarta => javaee}/util/internal/integrationtest/pom.xml (88%) rename {jakarta => javaee}/util/internal/test/orm/pom.xml (71%) rename {jakarta => javaee}/v5migrationhelper/orm/pom.xml (89%) diff --git a/build/config/pom.xml b/build/config/pom.xml index 12419be1b3e..11106bc220b 100644 --- a/build/config/pom.xml +++ b/build/config/pom.xml @@ -69,7 +69,7 @@ org.hibernate - hibernate-core + hibernate-core-jakarta javadoc jar ${version.org.hibernate} @@ -100,8 +100,8 @@ ${tmpdir.dependencies-javadoc-packagelists}/lucene-queryparser - javax.batch - javax.batch-api + jakarta.batch + jakarta.batch-api javadoc jar ${version.javax.batch} diff --git a/distribution/pom.xml b/distribution/pom.xml index 9d45251d90b..0f0d8b48750 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -103,34 +103,34 @@ pom - javax.persistence - javax.persistence-api + jakarta.persistence + jakarta.persistence-api - ${version.javax.persistence} + ${version.jakarta.persistence} provided - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec + jakarta.transaction + jakarta.transaction-api - ${version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec} + ${version.jakarta.transaction-api} provided - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api provided - javax.batch - javax.batch-api + jakarta.batch + jakarta.batch-api provided - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api - ${version.javax.enterprise} + ${version.jakarta.enterprise} provided diff --git a/distribution/src/main/assembly/dist.xml b/distribution/src/main/assembly/dist.xml index a251871fbda..e9ccc039aa0 100644 --- a/distribution/src/main/assembly/dist.xml +++ b/distribution/src/main/assembly/dist.xml @@ -145,11 +145,11 @@ false true - javax.persistence:javax.persistence-api - org.jboss.spec.javax.transaction:* - javax.batch:javax.batch-api - javax.inject:javax.inject - javax.enterprise:cdi-api + jakarta.persistence:jakarta.persistence-api + jakarta.transaction:jakarta.transaction-api + jakarta.batch:jakarta.batch-api + jakarta.inject:jakarta.inject-api + jakarta.enterprise:jakarta.enterprise.cdi-api diff --git a/documentation/pom.xml b/documentation/pom.xml index 34e9f187b56..09dd1899d38 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -316,6 +316,7 @@ https://in.relation.to/ ${version.org.hibernate} ${documentation.org.hibernate.url} + https://www.oracle.com/java/technologies/java-ee-glance.html ${parsed-version.javax.persistence.majorVersion}.${parsed-version.javax.persistence.minorVersion} ${documentation.org.hibernate.orm.url} ${version.org.hibernate.orm} diff --git a/documentation/src/main/asciidoc/reference/compatibility.asciidoc b/documentation/src/main/asciidoc/reference/compatibility.asciidoc index 46fee5aa336..e83bd9d6ba8 100644 --- a/documentation/src/main/asciidoc/reference/compatibility.asciidoc +++ b/documentation/src/main/asciidoc/reference/compatibility.asciidoc @@ -14,12 +14,12 @@ |Hibernate ORM (for the <> |{hibernateVersion} | -|JPA (Java EE) (for the <> -|{jpaVersion} -| -|Jakarta Persistence (for the <> +|Jakarta Persistence (for the ORM mapper) |{jakartaPersistenceVersion} -|Need to use <>. +| +|JPA (Java EE) (for the ORM mapper) +|{jpaVersion} +|Need to use <>. |Apache Lucene (for the <>) |{luceneVersion} | diff --git a/documentation/src/main/asciidoc/reference/integrations.asciidoc b/documentation/src/main/asciidoc/reference/integrations.asciidoc index 986dc807e24..aab9ee69ea4 100644 --- a/documentation/src/main/asciidoc/reference/integrations.asciidoc +++ b/documentation/src/main/asciidoc/reference/integrations.asciidoc @@ -4,12 +4,16 @@ [[other-integrations-jakarta]] == Jakarta EE -include::components/incubating-warning.asciidoc[] +When standard APIs are involved, +Hibernate Search targets link:{jakartaUrl}[Jakarta EE] by default. + +[[other-integrations-javaee]] +== Java EE -Hibernate Search includes experimental support for link:{jakartaUrl}[Jakarta EE], +Hibernate Search includes legacy support for link:{javaeeUrl}[Java EE], and it requires only one small change: when declaring the dependencies of your project, -you must add `-jakarta` to some artifact identifiers. +you must add `-javaee` to some artifact identifiers. For example, an application using Hibernate ORM and the Elasticsearch backend will need to update its dependencies as follows: @@ -18,13 +22,12 @@ will need to update its dependencies as follows: ---- org.hibernate - hibernate-core-jakarta + hibernate-core-javaee {hibernateVersion} org.hibernate.search - - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee {hibernateSearchVersion} @@ -35,18 +38,18 @@ will need to update its dependencies as follows: ---- <1> Replaces `hibernate-core`. <2> Replaces `hibernate-search-mapper-orm`. -<3> No replacement necessary: this artifact does not rely on Java EE. +<3> No replacement necessary: this artifact does not rely on Jakarta EE. -All artifacts relying directly or indirectly on Java EE must be replaced with their Jakarta counterpart. +All artifacts relying directly or indirectly on Jakarta EE must be replaced with their Java EE counterpart. This includes in particular: * https://in.relation.to/2021/06/04/hibernate-is-jakarta-jpa-2/#get-it[Hibernate ORM artifacts] -* `hibernate-search-mapper-orm` => `hibernate-search-mapper-orm-jakarta` -* `hibernate-search-mapper-orm-batch-jsr352-core` => `hibernate-search-mapper-orm-batch-jsr352-core-jakarta` +* `hibernate-search-mapper-orm` => `hibernate-search-mapper-orm-javaee` +* `hibernate-search-mapper-orm-batch-jsr352-core` => `hibernate-search-mapper-orm-batch-jsr352-core-javaee` * ... -Artifacts that do not rely on Java EE at all, on the other hand, -do not have a Jakarta counterpart and must not be replaced. +Artifacts that do not rely on Jakarta EE at all, on the other hand, +do not have a Java EE counterpart and must not be replaced. These artifacts should be excluded from your replacements in particular: * `hibernate-search-engine` diff --git a/documentation/src/test/java/org/hibernate/search/documentation/analysis/AnalysisIT.java b/documentation/src/test/java/org/hibernate/search/documentation/analysis/AnalysisIT.java index 70e6f4c7878..e7aef13082e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/analysis/AnalysisIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/analysis/AnalysisIT.java @@ -10,10 +10,10 @@ import static org.hibernate.search.util.impl.integrationtest.common.rule.BackendConfiguration.isLucene; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/analysis/ElasticsearchAnalysisIT.java b/documentation/src/test/java/org/hibernate/search/documentation/analysis/ElasticsearchAnalysisIT.java index f3909792c84..4f765353152 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/analysis/ElasticsearchAnalysisIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/analysis/ElasticsearchAnalysisIT.java @@ -9,10 +9,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchIndexSettings; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/analysis/LuceneAnalysisIT.java b/documentation/src/test/java/org/hibernate/search/documentation/analysis/LuceneAnalysisIT.java index d2bc3d7ac33..ed0960b6733 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/analysis/LuceneAnalysisIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/analysis/LuceneAnalysisIT.java @@ -9,10 +9,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/Book.java index 3b7a384dc03..c19cb76eeb3 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/Book.java @@ -7,8 +7,8 @@ package org.hibernate.search.documentation.backend.elasticsearch.client; import java.sql.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.types.Aggregable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/ElasticsearchGetClientIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/ElasticsearchGetClientIT.java index 013d48a2036..c156bda03c8 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/ElasticsearchGetClientIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/ElasticsearchGetClientIT.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.ElasticsearchBackend; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/ElasticsearchHttpClientConfigurerIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/ElasticsearchHttpClientConfigurerIT.java index f7d81670e93..573c364a12d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/ElasticsearchHttpClientConfigurerIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/ElasticsearchHttpClientConfigurerIT.java @@ -8,9 +8,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/indexmanager/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/indexmanager/Book.java index df6f98734b8..d2a8a2c914a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/indexmanager/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/indexmanager/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.backend.elasticsearch.indexmanager; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/indexmanager/ElasticsearchIndexManagerIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/indexmanager/ElasticsearchIndexManagerIT.java index 1d44c5040fa..2d39f3186d7 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/indexmanager/ElasticsearchIndexManagerIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/indexmanager/ElasticsearchIndexManagerIT.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.metamodel.ElasticsearchIndexDescriptor; import org.hibernate.search.backend.elasticsearch.index.ElasticsearchIndexManager; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/layout/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/layout/Book.java index cd6e0198d86..3ca23e14bcc 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/layout/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/layout/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.backend.elasticsearch.layout; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/layout/ElasticsearchCustomLayoutStrategyIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/layout/ElasticsearchCustomLayoutStrategyIT.java index e063fec36bc..54287a107cc 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/layout/ElasticsearchCustomLayoutStrategyIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/layout/ElasticsearchCustomLayoutStrategyIT.java @@ -12,7 +12,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.ElasticsearchExtension; import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchBackendSettings; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/mapping/ElasticsearchCustomIndexMappingIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/mapping/ElasticsearchCustomIndexMappingIT.java index 176ed86cb6c..91a83bb7396 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/mapping/ElasticsearchCustomIndexMappingIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/mapping/ElasticsearchCustomIndexMappingIT.java @@ -14,7 +14,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchIndexSettings; import org.hibernate.search.documentation.backend.elasticsearch.layout.Book; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/setting/ElasticsearchCustomIndexSettingsIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/setting/ElasticsearchCustomIndexSettingsIT.java index 8ff9898b91f..eecc49995df 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/setting/ElasticsearchCustomIndexSettingsIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/setting/ElasticsearchCustomIndexSettingsIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchIndexSettings; import org.hibernate.search.documentation.backend.elasticsearch.layout.Book; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/type/asnative/CompanyServer.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/type/asnative/CompanyServer.java index 0b7b584f10c..eb492784ba9 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/type/asnative/CompanyServer.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/type/asnative/CompanyServer.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.backend.elasticsearch.type.asnative; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/type/asnative/ElasticsearchNativeTypeIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/type/asnative/ElasticsearchNativeTypeIT.java index b7a4077fd28..f79d938a4c7 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/type/asnative/ElasticsearchNativeTypeIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/type/asnative/ElasticsearchNativeTypeIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.ElasticsearchExtension; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/analyzer/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/analyzer/Book.java index a52a98e6594..acc6922f2e3 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/analyzer/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/analyzer/Book.java @@ -7,8 +7,8 @@ package org.hibernate.search.documentation.backend.lucene.analyzer; import java.sql.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.types.Aggregable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/analyzer/LuceneGetAnalyzerIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/analyzer/LuceneGetAnalyzerIT.java index 8dc629d5e1c..bcabf849dc0 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/analyzer/LuceneGetAnalyzerIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/analyzer/LuceneGetAnalyzerIT.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.lucene.LuceneBackend; import org.hibernate.search.backend.lucene.index.LuceneIndexManager; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/indexmanager/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/indexmanager/Book.java index 60ebc66afd6..1dba55fad2b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/indexmanager/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/indexmanager/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.backend.lucene.indexmanager; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/indexmanager/LuceneGetIndexSizeIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/indexmanager/LuceneGetIndexSizeIT.java index 3e2941124aa..964ea4d705c 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/indexmanager/LuceneGetIndexSizeIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/indexmanager/LuceneGetIndexSizeIT.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.lucene.index.LuceneIndexManager; import org.hibernate.search.documentation.backend.lucene.analyzer.Book; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/lowlevel/LuceneLowLevelIndexReaderIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/lowlevel/LuceneLowLevelIndexReaderIT.java index fe701df3e16..f57ec9e32db 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/lowlevel/LuceneLowLevelIndexReaderIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/lowlevel/LuceneLowLevelIndexReaderIT.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.lucene.LuceneExtension; import org.hibernate.search.backend.lucene.scope.LuceneIndexScope; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/type/asnative/LuceneNativeTypeIT.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/type/asnative/LuceneNativeTypeIT.java index 0400150b4eb..2ca3eaa67a1 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/type/asnative/LuceneNativeTypeIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/type/asnative/LuceneNativeTypeIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.lucene.LuceneExtension; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/type/asnative/WebPage.java b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/type/asnative/WebPage.java index 1704c7b4863..74d9f37a0ac 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/type/asnative/WebPage.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/backend/lucene/type/asnative/WebPage.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.backend.lucene.type.asnative; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/alternative/alternativebinder/AlternativeBinderIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/alternative/alternativebinder/AlternativeBinderIT.java index f15be929434..e682ca2924b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/alternative/alternativebinder/AlternativeBinderIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/alternative/alternativebinder/AlternativeBinderIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/alternative/alternativebinder/BlogEntry.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/alternative/alternativebinder/BlogEntry.java index 9357bed7af6..ac84e940730 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/alternative/alternativebinder/BlogEntry.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/alternative/alternativebinder/BlogEntry.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.alternative.alternativebinder; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.AlternativeDiscriminator; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/fromotherentity/DependenciesFromOtherEntityIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/fromotherentity/DependenciesFromOtherEntityIT.java index 7c2b3b2b3c5..8fc14fe5af1 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/fromotherentity/DependenciesFromOtherEntityIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/fromotherentity/DependenciesFromOtherEntityIT.java @@ -10,7 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/fromotherentity/ScientificPaper.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/fromotherentity/ScientificPaper.java index 3cad865f808..f7cdc3e6017 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/fromotherentity/ScientificPaper.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/fromotherentity/ScientificPaper.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.TypeBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/Book.java index 71178835682..ba0d3d0ef60 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/Book.java @@ -9,15 +9,15 @@ import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OrderBy; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OrderBy; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.PropertyBinderRef; import org.hibernate.search.mapper.pojo.extractor.builtin.BuiltinContainerExtractors; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/BookEdition.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/BookEdition.java index 74dbcb173d3..ac6efbc610e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/BookEdition.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/BookEdition.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.dependencies.containers.property; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class BookEdition { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/DependenciesContainersPropertyIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/DependenciesContainersPropertyIT.java index dc05367a81e..a2ab18d6a87 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/DependenciesContainersPropertyIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/property/DependenciesContainersPropertyIT.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/Book.java index 703a9c1d9aa..9c75eb1159e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/Book.java @@ -9,15 +9,15 @@ import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OrderBy; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OrderBy; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.TypeBinderRef; import org.hibernate.search.mapper.pojo.extractor.builtin.BuiltinContainerExtractors; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/BookEdition.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/BookEdition.java index 024b40fc405..0d8be5888b5 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/BookEdition.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/BookEdition.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.dependencies.containers.simple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class BookEdition { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/DependenciesContainersSimpleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/DependenciesContainersSimpleIT.java index dd7ba35c919..e1ece8d42b9 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/DependenciesContainersSimpleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/containers/simple/DependenciesContainersSimpleIT.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/Author.java index 9f210c90730..00c32c2df4d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/Author.java @@ -8,10 +8,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Author { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/Book.java index 1b8880fbb34..71f0ae60ff3 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.dependencies.simple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.TypeBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/DependenciesSimpleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/DependenciesSimpleIT.java index 81d1db0d6ec..890d22175cc 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/DependenciesSimpleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/dependencies/simple/DependenciesSimpleIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/dynamic/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/dynamic/Book.java index 55b49c45cd2..7a2371682cb 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/dynamic/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/dynamic/Book.java @@ -9,9 +9,9 @@ import java.io.Serializable; import java.util.Map; import java.util.TreeMap; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.SortNatural; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.PropertyBinderRef; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/dynamic/DocumentModelDslDynamicIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/dynamic/DocumentModelDslDynamicIT.java index af11cd17c52..4ec7305a4ef 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/dynamic/DocumentModelDslDynamicIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/dynamic/DocumentModelDslDynamicIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/DocumentModelDslObjectIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/DocumentModelDslObjectIT.java index 7a10072d9b5..7254fe3f42a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/DocumentModelDslObjectIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/DocumentModelDslObjectIT.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/Invoice.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/Invoice.java index c00a6afb521..6a3a962da0e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/Invoice.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/Invoice.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.PropertyBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/InvoiceLineItem.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/InvoiceLineItem.java index 97e3817febc..5cb2d838d69 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/InvoiceLineItem.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/object/InvoiceLineItem.java @@ -7,7 +7,7 @@ package org.hibernate.search.documentation.mapper.orm.bridge.document.model.dsl.object; import java.math.BigDecimal; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class InvoiceLineItem { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/Author.java index 422ed3e2991..a89bc1caf34 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.document.model.dsl.simple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.TypeBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/Book.java index 02d602fc16e..db2ef5f7f41 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.document.model.dsl.simple; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/DocumentModelDslSimpleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/DocumentModelDslSimpleIT.java index 8eb66c09f7e..2e39c69034a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/DocumentModelDslSimpleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/document/model/dsl/simple/DocumentModelDslSimpleIT.java @@ -12,7 +12,7 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/Book.java index 9c52f2fb96b..ab43bb0354a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.identifierbridge.binder; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.IdentifierBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/BookId.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/BookId.java index 9945c64e0fa..9e785a1e2f9 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/BookId.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/BookId.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class BookId implements Serializable { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/IdentifierBinderIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/IdentifierBinderIT.java index 8cfd5fa5838..403ba6084b4 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/IdentifierBinderIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/binder/IdentifierBinderIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/Book.java index 03f0fbbc130..55aaca6314c 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.identifierbridge.compatible; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.IdentifierBridgeRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/BookOrMagazineId.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/BookOrMagazineId.java index 7120ee14b67..9df94779c86 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/BookOrMagazineId.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/BookOrMagazineId.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class BookOrMagazineId implements Serializable { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/IdentifierBridgeCompatibleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/IdentifierBridgeCompatibleIT.java index 6490b7dd702..4bfdbe1d9fb 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/IdentifierBridgeCompatibleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/IdentifierBridgeCompatibleIT.java @@ -12,7 +12,7 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/Magazine.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/Magazine.java index 75b519dcc95..12b602f564d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/Magazine.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/compatible/Magazine.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.identifierbridge.compatible; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.IdentifierBridgeRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/ormcontext/IdentifierBridgeOrmContextIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/ormcontext/IdentifierBridgeOrmContextIT.java index 2147e3aa086..b04dcafb1dd 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/ormcontext/IdentifierBridgeOrmContextIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/ormcontext/IdentifierBridgeOrmContextIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/ormcontext/MyEntity.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/ormcontext/MyEntity.java index bd66dbf743a..cfcc2ae5226 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/ormcontext/MyEntity.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/ormcontext/MyEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.identifierbridge.ormcontext; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.IdentifierBridgeRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/Book.java index f78833d4064..d43937080a2 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.identifierbridge.param; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/IdentifierBridgeParamIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/IdentifierBridgeParamIT.java index 187fd0d4df6..5630a45a962 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/IdentifierBridgeParamIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/IdentifierBridgeParamIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/context/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/context/Book.java index 0e24759a7a2..b1968238263 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/context/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/context/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.identifierbridge.param.context; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.IdentifierBinderRef; import org.hibernate.search.mapper.pojo.common.annotation.Param; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/context/IdentifierBridgeParamIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/context/IdentifierBridgeParamIT.java index 0cb8ec1f79e..90b993e696f 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/context/IdentifierBridgeParamIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/param/context/IdentifierBridgeParamIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/Book.java index 928a312f8b4..fd7db716c05 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.identifierbridge.simple; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.IdentifierBridgeRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/BookId.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/BookId.java index 0682d6a4126..3464f79ea54 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/BookId.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/BookId.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class BookId implements Serializable { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/IdentifierBridgeSimpleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/IdentifierBridgeSimpleIT.java index 4c06f7e198f..231c4c73734 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/IdentifierBridgeSimpleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/identifierbridge/simple/IdentifierBridgeSimpleIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/namedpredicate/ItemStock.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/namedpredicate/ItemStock.java index a19c4516427..1a9f32bca6c 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/namedpredicate/ItemStock.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/namedpredicate/ItemStock.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.namedpredicate; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.PropertyBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/namedpredicate/NamedPredicateIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/namedpredicate/NamedPredicateIT.java index 07abc4618b9..a41cb9feec1 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/namedpredicate/NamedPredicateIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/namedpredicate/NamedPredicateIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/bridgedelement/Invoice.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/bridgedelement/Invoice.java index 24e69c420fb..7bd8df4b454 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/bridgedelement/Invoice.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/bridgedelement/Invoice.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.documentation.mapper.orm.bridge.propertybridge.param.InvoiceLineItem; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.PropertyBinderRef; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/bridgedelement/PropertyBridgeBridgedElementIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/bridgedelement/PropertyBridgeBridgedElementIT.java index 9ffec722153..92ba677faf7 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/bridgedelement/PropertyBridgeBridgedElementIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/bridgedelement/PropertyBridgeBridgedElementIT.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.mapper.orm.bridge.propertybridge.param.InvoiceLineItem; import org.hibernate.search.documentation.mapper.orm.bridge.propertybridge.param.InvoiceLineItemCategory; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/ormcontext/MyEntity.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/ormcontext/MyEntity.java index 0eb1a6371f1..75bac418ad5 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/ormcontext/MyEntity.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/ormcontext/MyEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.propertybridge.ormcontext; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.PropertyBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/ormcontext/PropertyBridgeOrmContextIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/ormcontext/PropertyBridgeOrmContextIT.java index 67b60e5e11e..229fd8c87a4 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/ormcontext/PropertyBridgeOrmContextIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/ormcontext/PropertyBridgeOrmContextIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/Invoice.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/Invoice.java index 24682350a3b..1f960813189 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/Invoice.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/Invoice.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/InvoiceLineItem.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/InvoiceLineItem.java index 3ac8607e67b..a83d22a47a5 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/InvoiceLineItem.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/InvoiceLineItem.java @@ -7,7 +7,7 @@ package org.hibernate.search.documentation.mapper.orm.bridge.propertybridge.param; import java.math.BigDecimal; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class InvoiceLineItem { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/PropertyBridgeParamIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/PropertyBridgeParamIT.java index a56c8d11302..07d1cb970bc 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/PropertyBridgeParamIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/PropertyBridgeParamIT.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/context/Invoice.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/context/Invoice.java index 16ae5590a8e..1340d6e366d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/context/Invoice.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/context/Invoice.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.documentation.mapper.orm.bridge.propertybridge.param.InvoiceLineItem; import org.hibernate.search.mapper.pojo.common.annotation.Param; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/context/PropertyBridgeParamIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/context/PropertyBridgeParamIT.java index e2616df25ad..431e3f03712 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/context/PropertyBridgeParamIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/param/context/PropertyBridgeParamIT.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.mapper.orm.bridge.propertybridge.param.InvoiceLineItem; import org.hibernate.search.documentation.mapper.orm.bridge.propertybridge.param.InvoiceLineItemCategory; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/Invoice.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/Invoice.java index ce5e89c3086..6f0f80dd6ba 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/Invoice.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/Invoice.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.PropertyBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/InvoiceLineItem.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/InvoiceLineItem.java index 01531495905..a85338ff5ad 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/InvoiceLineItem.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/InvoiceLineItem.java @@ -7,7 +7,7 @@ package org.hibernate.search.documentation.mapper.orm.bridge.propertybridge.simple; import java.math.BigDecimal; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class InvoiceLineItem { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/PropertyBridgeSimpleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/PropertyBridgeSimpleIT.java index a9ba9cdf24c..1be7e1e83d6 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/PropertyBridgeSimpleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/propertybridge/simple/PropertyBridgeSimpleIT.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/Book.java index 55465c2dd5b..e82e91a0c69 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.resolver; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.engine.backend.types.Projectable; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/BridgeResolverIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/BridgeResolverIT.java index d2882c0e5ae..e1771a223d6 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/BridgeResolverIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/BridgeResolverIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/MyCoordinates.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/MyCoordinates.java index fc4f08d0f0a..8e7ddd5da58 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/MyCoordinates.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/MyCoordinates.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.resolver; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; // Let's assume this type cannot be changed to implement GeoPoint. @Embeddable diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/MyProductId.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/MyProductId.java index aee87b54cac..43f05fc4897 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/MyProductId.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/resolver/MyProductId.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class MyProductId implements Serializable { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/conditionalindexing/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/conditionalindexing/Book.java index b04a858bace..5d1557ae6d6 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/conditionalindexing/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/conditionalindexing/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.routingbridge.conditionalindexing; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.RoutingBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/conditionalindexing/RoutingBridgeConditionalIndexingIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/conditionalindexing/RoutingBridgeConditionalIndexingIT.java index 42c41c24a80..aeeaac128af 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/conditionalindexing/RoutingBridgeConditionalIndexingIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/conditionalindexing/RoutingBridgeConditionalIndexingIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/ormcontext/MyEntity.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/ormcontext/MyEntity.java index 331827f13a3..b877cbe882e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/ormcontext/MyEntity.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/ormcontext/MyEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.routingbridge.ormcontext; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.RoutingBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/ormcontext/RoutingBridgeOrmContextIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/ormcontext/RoutingBridgeOrmContextIT.java index da56f34364d..ad91e05105a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/ormcontext/RoutingBridgeOrmContextIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/ormcontext/RoutingBridgeOrmContextIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/routingkey/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/routingkey/Book.java index 35290c57425..31916d60d45 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/routingkey/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/routingkey/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.routingbridge.routingkey; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.RoutingBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/routingkey/RoutingBridgeRoutingKeyIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/routingkey/RoutingBridgeRoutingKeyIT.java index 55169151cad..9cdf3f3edc2 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/routingkey/RoutingBridgeRoutingKeyIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/routingbridge/routingkey/RoutingBridgeRoutingKeyIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/ormcontext/MyEntity.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/ormcontext/MyEntity.java index 11e9af126ec..2dde3b0144b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/ormcontext/MyEntity.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/ormcontext/MyEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.typebridge.ormcontext; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.TypeBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/ormcontext/TypeBridgeOrmContextIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/ormcontext/TypeBridgeOrmContextIT.java index 7a4e8a952dd..6748c7f341e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/ormcontext/TypeBridgeOrmContextIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/ormcontext/TypeBridgeOrmContextIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/Author.java index 34918eda9e5..8bcd7a89c1b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.typebridge.param; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/TypeBridgeParamIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/TypeBridgeParamIT.java index b20f4849ae8..f3312bd7270 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/TypeBridgeParamIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/TypeBridgeParamIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/context/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/context/Author.java index 94333d0ea21..5139268639b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/context/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/context/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.typebridge.param.context; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.common.annotation.Param; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.TypeBinderRef; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/context/TypeBridgeParamIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/context/TypeBridgeParamIT.java index b3c5a8f863e..9f831d21beb 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/context/TypeBridgeParamIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/param/context/TypeBridgeParamIT.java @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/simple/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/simple/Author.java index 7b28a2117ee..17bb271e56b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/simple/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/simple/Author.java @@ -7,9 +7,9 @@ package org.hibernate.search.documentation.mapper.orm.bridge.typebridge.simple; import java.time.LocalDate; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.TypeBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/simple/TypeBridgeSimpleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/simple/TypeBridgeSimpleIT.java index 68af658c273..f5269632bbf 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/simple/TypeBridgeSimpleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/typebridge/simple/TypeBridgeSimpleIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/dslconverter/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/dslconverter/Book.java index e6c8d31ae61..e292b588d6d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/dslconverter/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/dslconverter/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.types.dsl.dslconverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/dslconverter/IndexFieldTypeDslDslConverterIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/dslconverter/IndexFieldTypeDslDslConverterIT.java index 8c5d348af73..b9c5b76775a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/dslconverter/IndexFieldTypeDslDslConverterIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/dslconverter/IndexFieldTypeDslDslConverterIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/projectionconverter/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/projectionconverter/Book.java index 2528a50e164..d09bb6ea31c 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/projectionconverter/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/projectionconverter/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.types.dsl.projectionconverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/projectionconverter/IndexFieldTypeDslProjectionConverterIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/projectionconverter/IndexFieldTypeDslProjectionConverterIT.java index 8ba045540e0..92859a674b0 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/projectionconverter/IndexFieldTypeDslProjectionConverterIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/projectionconverter/IndexFieldTypeDslProjectionConverterIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/simple/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/simple/Book.java index b2005d4141a..d7ccf6af5e9 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/simple/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/simple/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.types.dsl.simple; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/simple/IndexFieldTypeDslSimpleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/simple/IndexFieldTypeDslSimpleIT.java index e6d0993ef9c..6b1e81d020b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/simple/IndexFieldTypeDslSimpleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/types/dsl/simple/IndexFieldTypeDslSimpleIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/binder/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/binder/Book.java index 0f5ecd316cc..43f286a7c55 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/binder/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/binder/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.valuebridge.binder; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/binder/ValueBridgeBinderIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/binder/ValueBridgeBinderIT.java index 46794abc4b3..ff2e0a45972 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/binder/ValueBridgeBinderIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/binder/ValueBridgeBinderIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/Book1.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/Book1.java index 6370bf2de14..eb232701de5 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/Book1.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/Book1.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.valuebridge.compatible; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/Book2.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/Book2.java index c9ffc64cb57..3876a86eab0 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/Book2.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/Book2.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.valuebridge.compatible; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/ValueBridgeCompatibleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/ValueBridgeCompatibleIT.java index cf65eeedc30..62330da8443 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/ValueBridgeCompatibleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/compatible/ValueBridgeCompatibleIT.java @@ -12,7 +12,7 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/indexnullas/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/indexnullas/Book.java index 84ac1b6c7e0..4362b2768fe 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/indexnullas/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/indexnullas/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.valuebridge.indexnullas; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/indexnullas/ValueBridgeIndexNullAsIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/indexnullas/ValueBridgeIndexNullAsIT.java index d4bcdbef543..897b9012202 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/indexnullas/ValueBridgeIndexNullAsIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/indexnullas/ValueBridgeIndexNullAsIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/ormcontext/MyEntity.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/ormcontext/MyEntity.java index a3a4dd2ba98..4edbe0d2f8e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/ormcontext/MyEntity.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/ormcontext/MyEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.valuebridge.ormcontext; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBridgeRef; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/ormcontext/ValueBridgeOrmContextIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/ormcontext/ValueBridgeOrmContextIT.java index 2fcebd79adf..189bd81ed8e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/ormcontext/ValueBridgeOrmContextIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/ormcontext/ValueBridgeOrmContextIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/Book.java index bdbded0efd7..33e570e1f29 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/Book.java @@ -9,10 +9,10 @@ import java.time.Year; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/ValueBridgeParamIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/ValueBridgeParamIT.java index f64a0165d9d..37e0075eb80 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/ValueBridgeParamIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/ValueBridgeParamIT.java @@ -12,7 +12,7 @@ import java.time.Year; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/context/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/context/Book.java index a5987af8dcd..05cb794b34b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/context/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/context/Book.java @@ -9,10 +9,10 @@ import java.time.Year; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.common.annotation.Param; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBinderRef; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/context/ValueBridgeParamIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/context/ValueBridgeParamIT.java index 3595dc682bd..624d1b5bffa 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/context/ValueBridgeParamIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/param/context/ValueBridgeParamIT.java @@ -12,7 +12,7 @@ import java.time.Year; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/projection/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/projection/Book.java index 4b4409ad324..d636141e864 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/projection/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/projection/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.valuebridge.projection; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/projection/ValueBridgeProjectionIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/projection/ValueBridgeProjectionIT.java index cf27b9a29a5..9b050a5e33d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/projection/ValueBridgeProjectionIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/projection/ValueBridgeProjectionIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/simple/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/simple/Book.java index 904cffbd39a..274bcff5d3a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/simple/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/simple/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.bridge.valuebridge.simple; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/simple/ValueBridgeSimpleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/simple/ValueBridgeSimpleIT.java index 3ae56f09aff..d8cd3c64490 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/simple/ValueBridgeSimpleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/bridge/valuebridge/simple/ValueBridgeSimpleIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/Author.java index 091ce63886a..085968e27ba 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/Author.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class Author { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/Book.java index f9e7559f33b..8224e5a27b2 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/Book.java @@ -11,14 +11,14 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.OrderBy; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OrderBy; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBridgeRef; import org.hibernate.search.mapper.pojo.extractor.builtin.BuiltinContainerExtractors; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/ContainerExtractorIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/ContainerExtractorIT.java index 8d0453308a7..069f1daaa01 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/ContainerExtractorIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/containerextractor/ContainerExtractorIT.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/directfieldmapping/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/directfieldmapping/Book.java index 9471b81aa29..d7c26ea379c 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/directfieldmapping/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/directfieldmapping/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.directfieldmapping; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.engine.backend.types.Sortable; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/directfieldmapping/HibernateOrmSimpleMappingIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/directfieldmapping/HibernateOrmSimpleMappingIT.java index 6057825607b..1f3097d3c5c 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/directfieldmapping/HibernateOrmSimpleMappingIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/directfieldmapping/HibernateOrmSimpleMappingIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/Author.java index cd018258985..aa4efcd1ce6 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.entityindexmapping; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/Book.java index 40d81017fa0..9c43ec032fa 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.entityindexmapping; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/HibernateOrmIndexedIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/HibernateOrmIndexedIT.java index 75c4060ae2b..be409efa6e4 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/HibernateOrmIndexedIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/HibernateOrmIndexedIT.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/User.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/User.java index 7fabbd4f5aa..fe77e25f41b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/User.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entityindexmapping/User.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.entityindexmapping; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Associate.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Associate.java index 30452c811ea..a5c1308f55e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Associate.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Associate.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.entrypoints; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Book.java index f3a9069ea71..a06f6b8b83f 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.entrypoints; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/HibernateOrmEntryPointsIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/HibernateOrmEntryPointsIT.java index da7c5656262..efdedae515d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/HibernateOrmEntryPointsIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/HibernateOrmEntryPointsIT.java @@ -10,8 +10,8 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.Arrays; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Manager.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Manager.java index a428d81925a..c77f64d3a60 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Manager.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/entrypoints/Manager.java @@ -8,10 +8,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/Author.java index 3b94239da0d..3127d0dc3b6 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/Author.java @@ -9,10 +9,10 @@ // tag::include[] import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/Book.java index 07232ba3a3a..90e8809da88 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/Book.java @@ -9,10 +9,10 @@ // tag::include[] import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/GettingStartedCustomAnalysisIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/GettingStartedCustomAnalysisIT.java index 637cd1ecf27..df05a460f34 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/GettingStartedCustomAnalysisIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/customanalysis/GettingStartedCustomAnalysisIT.java @@ -11,8 +11,8 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.hibernate.search.documentation.testsupport.TestConfiguration; import org.hibernate.search.engine.search.query.SearchResult; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/Author.java index 013f648a992..e045932ceed 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/Author.java @@ -9,10 +9,10 @@ // tag::include[] import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/Book.java index 0f78f5383ff..82b24973579 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/Book.java @@ -10,10 +10,10 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/GettingStartedDefaultAnalysisIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/GettingStartedDefaultAnalysisIT.java index 0636e46ced0..836f60dea99 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/GettingStartedDefaultAnalysisIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withhsearch/defaultanalysis/GettingStartedDefaultAnalysisIT.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.hibernate.search.documentation.testsupport.TestConfiguration; import org.hibernate.search.engine.search.query.SearchResult; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/Author.java index 00cbf1a88de..8fcf8771500 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/Author.java @@ -9,10 +9,10 @@ // tag::include[] import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class Author { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/Book.java index 9a351c30980..b7cb3cddb04 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/Book.java @@ -10,10 +10,10 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class Book { diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/GettingStartedWithoutHibernateSearchIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/GettingStartedWithoutHibernateSearchIT.java index dd3aea6607e..d39d336b775 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/GettingStartedWithoutHibernateSearchIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/gettingstarted/withouthsearch/GettingStartedWithoutHibernateSearchIT.java @@ -11,9 +11,9 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.TypedQuery; import org.junit.After; import org.junit.Before; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/customtype/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/customtype/Book.java index 3d7121f6720..ed6529968e4 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/customtype/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/customtype/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.identifiermapping.customtype; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.data.ISBN; import org.hibernate.search.documentation.testsupport.data.ISBNAttributeConverter; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/customtype/IdentifierMappingCustomTypeIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/customtype/IdentifierMappingCustomTypeIT.java index 53e3a54ad95..7dfeef8bfca 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/customtype/IdentifierMappingCustomTypeIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/customtype/IdentifierMappingCustomTypeIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/naturalid/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/naturalid/Book.java index 81cc72ce223..d7c9688ccc3 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/naturalid/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/naturalid/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.identifiermapping.naturalid; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/naturalid/IdentifierMappingNaturalIdIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/naturalid/IdentifierMappingNaturalIdIT.java index 240413c3c93..ba8b38c63d2 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/naturalid/IdentifierMappingNaturalIdIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/identifiermapping/naturalid/IdentifierMappingNaturalIdIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/Book.java index 904a16fad81..74be189134f 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/Book.java @@ -9,11 +9,11 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Transient; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.AssociationInverseSide; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/BookEdition.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/BookEdition.java index 4802f56430e..e944822299c 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/BookEdition.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/BookEdition.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.indexedembedded.filteredassociation; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/FilteredAssociationIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/FilteredAssociationIT.java index 7c07848c234..8da4a4e1652 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/FilteredAssociationIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/filteredassociation/FilteredAssociationIT.java @@ -10,8 +10,8 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepaths/Human.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepaths/Human.java index 267e69e9773..3e051462d53 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepaths/Human.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepaths/Human.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepaths/IndexedEmbeddedIncludePathsIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepaths/IndexedEmbeddedIncludePathsIT.java index 21aa616b3e6..4e187658dd0 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepaths/IndexedEmbeddedIncludePathsIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepaths/IndexedEmbeddedIncludePathsIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepathsanddepth/Human.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepathsanddepth/Human.java index d3f7419a4cd..bcf183ead3a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepathsanddepth/Human.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepathsanddepth/Human.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepathsanddepth/IndexedEmbeddedIncludePathsAndDepthIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepathsanddepth/IndexedEmbeddedIncludePathsAndDepthIT.java index 8a6798751bd..f36c66b25f6 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepathsanddepth/IndexedEmbeddedIncludePathsAndDepthIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/includepathsanddepth/IndexedEmbeddedIncludePathsAndDepthIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/Author.java index c8d69429390..5e6fdd11404 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/Author.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; // tag::include[] @Entity diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/Book.java index 5af771a5494..809429bf477 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/Book.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/IndexedEmbeddedNoneIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/IndexedEmbeddedNoneIT.java index 81b0fe69033..341656af0e6 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/IndexedEmbeddedNoneIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/none/IndexedEmbeddedNoneIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/Author.java index c57884e2cdb..0c11711c097 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/Author.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/Book.java index de20e386a73..d092c7ba65b 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/Book.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/IndexedEmbeddedOneLevelIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/IndexedEmbeddedOneLevelIT.java index 579d16534fd..e02515aea6e 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/IndexedEmbeddedOneLevelIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/onelevel/IndexedEmbeddedOneLevelIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/Author.java index 4c59945261c..71eee6cbc72 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/Author.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/Book.java index 4e18cb6ea22..c1512a234d2 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/Book.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/IndexedEmbeddedStructureFlattenedIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/IndexedEmbeddedStructureFlattenedIT.java index 7eeb53da6ab..e7d33f9a5a7 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/IndexedEmbeddedStructureFlattenedIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/flattened/IndexedEmbeddedStructureFlattenedIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/Author.java index c78826af33b..0b48155eedc 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/Author.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/Book.java index fb1a2950bb9..c2fdfbb184d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/Book.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/IndexedEmbeddedStructureNestedIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/IndexedEmbeddedStructureNestedIT.java index f0e17f966bb..171c7e12d63 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/IndexedEmbeddedStructureNestedIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/structure/nested/IndexedEmbeddedStructureNestedIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Address.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Address.java index 3a73e0149be..3cb4f8aa5b2 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Address.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Address.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.documentation.mapper.orm.indexedembedded.twolevels; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Author.java index ba6cb8a220d..13f052d7f1f 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Author.java @@ -8,10 +8,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Book.java index 06a7ce4af23..484985d7719 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/Book.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/IndexedEmbeddedTwoLevelsIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/IndexedEmbeddedTwoLevelsIT.java index d3df2778c9d..4c207bb9e6f 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/IndexedEmbeddedTwoLevelsIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedembedded/twolevels/IndexedEmbeddedTwoLevelsIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedentities/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedentities/Book.java index e4be16ac688..7c172fb00ec 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedentities/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedentities/Book.java @@ -7,8 +7,8 @@ package org.hibernate.search.documentation.mapper.orm.indexedentities; import java.sql.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.types.Aggregable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedentities/SearchMappingIndexedEntitiesIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedentities/SearchMappingIndexedEntitiesIT.java index 476a7541656..d94162f6f77 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedentities/SearchMappingIndexedEntitiesIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexedentities/SearchMappingIndexedEntitiesIT.java @@ -10,7 +10,7 @@ import java.sql.Date; import java.util.Optional; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/Author.java index efbdddb595c..e1db76d128d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/Author.java @@ -9,9 +9,9 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/Book.java index 7ad0b008f87..ffe0ce59cb9 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.indexing; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmAutomaticIndexingIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmAutomaticIndexingIT.java index ed2566d4815..4d31df5ab2a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmAutomaticIndexingIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmAutomaticIndexingIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmBatchJsr352IT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmBatchJsr352IT.java index a5e5617a921..df28c3eb9c7 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmBatchJsr352IT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmBatchJsr352IT.java @@ -14,11 +14,11 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.Properties; -import javax.batch.operations.JobOperator; -import javax.batch.runtime.BatchRuntime; -import javax.batch.runtime.BatchStatus; -import javax.batch.runtime.JobExecution; -import javax.persistence.EntityManagerFactory; +import jakarta.batch.operations.JobOperator; +import jakarta.batch.runtime.BatchRuntime; +import jakarta.batch.runtime.BatchStatus; +import jakarta.batch.runtime.JobExecution; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmManualIndexingIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmManualIndexingIT.java index fd2c61d76a5..4827249504d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmManualIndexingIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmManualIndexingIT.java @@ -10,8 +10,8 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.Arrays; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmMassIndexerIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmMassIndexerIT.java index 6db47f32969..e6cc187ce8f 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmMassIndexerIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmMassIndexerIT.java @@ -15,8 +15,8 @@ import java.time.LocalDate; import java.util.concurrent.Future; import java.util.function.Function; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/programmatic/simple/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/programmatic/simple/Book.java index 0641eda1415..da7f3139be0 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/programmatic/simple/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/programmatic/simple/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.programmatic.simple; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/programmatic/simple/ProgrammaticMappingSimpleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/programmatic/simple/ProgrammaticMappingSimpleIT.java index f645446d21b..343efddba34 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/programmatic/simple/ProgrammaticMappingSimpleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/programmatic/simple/ProgrammaticMappingSimpleIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/AssociationInverseSideIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/AssociationInverseSideIT.java index e49ad87e86a..ed092c65d12 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/AssociationInverseSideIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/AssociationInverseSideIT.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/Book.java index 9676ea04100..84382356e07 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/Book.java @@ -9,15 +9,15 @@ import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OrderBy; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OrderBy; import org.hibernate.search.mapper.pojo.extractor.builtin.BuiltinContainerExtractors; import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtraction; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/BookEdition.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/BookEdition.java index 7e7577a740a..b1858df51db 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/BookEdition.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/associationinverseside/BookEdition.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.reindexing.associationinverseside; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/derivedfrom/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/derivedfrom/Book.java index 570072e8cfd..7e449466aa1 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/derivedfrom/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/derivedfrom/Book.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/derivedfrom/DerivedFromIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/derivedfrom/DerivedFromIT.java index 06aa9d25b37..91f22a7f404 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/derivedfrom/DerivedFromIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/derivedfrom/DerivedFromIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/correct/ReindexOnUpdateNoIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/correct/ReindexOnUpdateNoIT.java index 5c0effdcb21..fea6d18f9de 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/correct/ReindexOnUpdateNoIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/correct/ReindexOnUpdateNoIT.java @@ -10,8 +10,8 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/correct/Sensor.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/correct/Sensor.java index 9f267ebe8dd..77e35e37a70 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/correct/Sensor.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/correct/Sensor.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.reindexing.reindexonupdate.no.correct; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/incorrect/ReindexOnUpdateNoIncorrectIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/incorrect/ReindexOnUpdateNoIncorrectIT.java index 094864eaaec..787f1b7c373 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/incorrect/ReindexOnUpdateNoIncorrectIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/incorrect/ReindexOnUpdateNoIncorrectIT.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/incorrect/Sensor.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/incorrect/Sensor.java index 4d81769ee6d..bb065fe1249 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/incorrect/Sensor.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/no/incorrect/Sensor.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.reindexing.reindexonupdate.no.incorrect; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/Book.java index e09769f36fc..2ff6018dea4 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.reindexing.reindexonupdate.shallow.correct; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/BookCategory.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/BookCategory.java index 121144b7ed5..73850b3cdfa 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/BookCategory.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/BookCategory.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.reindexing.reindexonupdate.shallow.correct; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/ReindexOnUpdateShallowIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/ReindexOnUpdateShallowIT.java index 512b3415b45..c9f4d4fcce8 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/ReindexOnUpdateShallowIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/correct/ReindexOnUpdateShallowIT.java @@ -10,8 +10,8 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/incorrect/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/incorrect/Book.java index 1a6ce95ee74..00084c5c9cc 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/incorrect/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/incorrect/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.reindexing.reindexonupdate.shallow.incorrect; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/incorrect/BookCategory.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/incorrect/BookCategory.java index 3aa62c8d759..d85f7668394 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/incorrect/BookCategory.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/reindexing/reindexonupdate/shallow/incorrect/BookCategory.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.reindexing.reindexonupdate.shallow.incorrect; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/Author.java index ca490d51e39..5598844e3b0 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/Author.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/Book.java index 82ac3dddca9..f1012dcb206 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.schema.management; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/HibernateOrmSchemaManagerIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/HibernateOrmSchemaManagerIT.java index 7bf84e32714..48a5f72f274 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/HibernateOrmSchemaManagerIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/schema/management/HibernateOrmSchemaManagerIT.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/Author.java index 9b1a4d0a6b4..f850bdf2568 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/Author.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.spatial.genericfield; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/GeoPointGenericFieldIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/GeoPointGenericFieldIT.java index ecba8221f9e..f0ef1044d46 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/GeoPointGenericFieldIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/GeoPointGenericFieldIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/MyCoordinates.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/MyCoordinates.java index 04521354f40..521be37f85d 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/MyCoordinates.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/genericfield/MyCoordinates.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.spatial.genericfield; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; import org.hibernate.search.engine.spatial.GeoPoint; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/multiple/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/multiple/Author.java index 650db55e90f..12b58659f7a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/multiple/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/multiple/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.spatial.geopointbinding.multiple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.GeoPointBinding; import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.Latitude; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/multiple/GeoPointBindingMultipleIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/multiple/GeoPointBindingMultipleIT.java index e0caecf9b0b..9704e0e2b76 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/multiple/GeoPointBindingMultipleIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/multiple/GeoPointBindingMultipleIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/Author.java index 8800e70d1e0..0ea304b3e47 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/Author.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.mapper.orm.spatial.geopointbinding.property; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.GeoPointBinding; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/GeoPointBindingPropertyIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/GeoPointBindingPropertyIT.java index afd56d8f877..0a1b793c4f9 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/GeoPointBindingPropertyIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/GeoPointBindingPropertyIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/MyCoordinates.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/MyCoordinates.java index 9ac20a2a9dc..202217f3a98 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/MyCoordinates.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/property/MyCoordinates.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.mapper.orm.spatial.geopointbinding.property; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.Latitude; import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.Longitude; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/type/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/type/Author.java index 1c04c6a0ea4..a9cc485041f 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/type/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/type/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.mapper.orm.spatial.geopointbinding.type; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.GeoPointBinding; import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.Latitude; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/type/GeoPointBindingTypeIT.java b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/type/GeoPointBindingTypeIT.java index a2f6e38b1d1..a18ded7e696 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/type/GeoPointBindingTypeIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/spatial/geopointbinding/type/GeoPointBindingTypeIT.java @@ -10,7 +10,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/reporting/failurehandler/FailureHandlerIT.java b/documentation/src/test/java/org/hibernate/search/documentation/reporting/failurehandler/FailureHandlerIT.java index 27566e93b76..3ecfb54c737 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/reporting/failurehandler/FailureHandlerIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/reporting/failurehandler/FailureHandlerIT.java @@ -8,9 +8,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/AggregationDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/AggregationDslIT.java index 80c78f0f8c7..4b165856539 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/AggregationDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/AggregationDslIT.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/Book.java index cd04d458db9..0637ccc1e17 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/Book.java @@ -9,11 +9,11 @@ import java.sql.Date; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.search.engine.backend.types.Aggregable; import org.hibernate.search.engine.backend.types.ObjectStructure; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/BookEdition.java b/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/BookEdition.java index f70a1a17042..fdd64f657bc 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/BookEdition.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/BookEdition.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.documentation.search.aggregation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.engine.backend.types.Aggregable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/ElasticsearchAggregationDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/ElasticsearchAggregationDslIT.java index 388a9522c1e..569fd1b4da5 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/ElasticsearchAggregationDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/aggregation/ElasticsearchAggregationDslIT.java @@ -11,7 +11,7 @@ import java.sql.Date; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.ElasticsearchExtension; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/converter/DslConverterIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/converter/DslConverterIT.java index 619947eb035..d5904d772fb 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/converter/DslConverterIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/converter/DslConverterIT.java @@ -11,11 +11,11 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/converter/ProjectionConverterIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/converter/ProjectionConverterIT.java index 17be610a788..831a44666b2 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/converter/ProjectionConverterIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/converter/ProjectionConverterIT.java @@ -12,12 +12,12 @@ import java.util.List; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/paths/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/search/paths/Author.java index 13ce8d2d458..9a0b9dc36bd 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/paths/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/paths/Author.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/paths/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/search/paths/Book.java index f399c68afce..f16ff3e8b88 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/paths/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/paths/Book.java @@ -8,10 +8,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/paths/FieldPathsIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/paths/FieldPathsIT.java index a1d05cde19f..01e925647f1 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/paths/FieldPathsIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/paths/FieldPathsIT.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Address.java b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Address.java index b159b6c68e2..888a050d9aa 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Address.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Address.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.search.predicate; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Author.java index 4fc806f3b7f..5c57418e630 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Author.java @@ -8,10 +8,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Book.java index 708b431f67f..d3fd7eaea6c 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/Book.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/ElasticsearchPredicateDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/ElasticsearchPredicateDslIT.java index bbf621e09b9..1402db41f3a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/ElasticsearchPredicateDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/ElasticsearchPredicateDslIT.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.ElasticsearchExtension; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/EmbeddableGeoPoint.java b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/EmbeddableGeoPoint.java index 39274897971..41636438957 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/EmbeddableGeoPoint.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/EmbeddableGeoPoint.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.search.predicate; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; import org.hibernate.search.engine.spatial.GeoPoint; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/LucenePredicateDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/LucenePredicateDslIT.java index 48c38cb8497..ab2972d4f32 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/LucenePredicateDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/LucenePredicateDslIT.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.lucene.LuceneExtension; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/PredicateDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/PredicateDslIT.java index 48f5a2cbd20..39db57db4ff 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/PredicateDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/predicate/PredicateDslIT.java @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.List; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/Author.java index 37a880482b5..3b34155cc0a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/Author.java @@ -9,10 +9,10 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/Book.java index a944214b7d5..a1941fae1ff 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/Book.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.engine.backend.types.Projectable; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/ElasticsearchProjectionDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/ElasticsearchProjectionDslIT.java index b31c0476457..d9864a4f479 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/ElasticsearchProjectionDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/ElasticsearchProjectionDslIT.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.ElasticsearchExtension; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/EmbeddableGeoPoint.java b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/EmbeddableGeoPoint.java index 25d9a7cbf94..9f9ddead669 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/EmbeddableGeoPoint.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/EmbeddableGeoPoint.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.search.projection; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; import org.hibernate.search.engine.spatial.GeoPoint; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/LuceneProjectionDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/LuceneProjectionDslIT.java index 18b8b5d05ff..74ef82d347a 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/LuceneProjectionDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/LuceneProjectionDslIT.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.lucene.LuceneExtension; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/ProjectionDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/ProjectionDslIT.java index 85f03adc234..92044c3d483 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/projection/ProjectionDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/projection/ProjectionDslIT.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/query/Associate.java b/documentation/src/test/java/org/hibernate/search/documentation/search/query/Associate.java index 2b1225aec51..832808d2928 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/query/Associate.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/query/Associate.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.search.query; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/query/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/search/query/Book.java index d02e51083ad..26f03710111 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/query/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/query/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.documentation.search.query; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.engine.backend.types.Sortable; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/query/ElasticsearchQueryDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/query/ElasticsearchQueryDslIT.java index e0f2e1e5965..4da5b9afebc 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/query/ElasticsearchQueryDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/query/ElasticsearchQueryDslIT.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.ElasticsearchExtension; import org.hibernate.search.backend.elasticsearch.search.query.ElasticsearchSearchQuery; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/query/LuceneQueryDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/query/LuceneQueryDslIT.java index 245e3c9b65b..89f74d6aa28 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/query/LuceneQueryDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/query/LuceneQueryDslIT.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.lucene.LuceneExtension; import org.hibernate.search.backend.lucene.search.query.LuceneSearchQuery; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/query/Manager.java b/documentation/src/test/java/org/hibernate/search/documentation/search/query/Manager.java index 625fa328bde..e6c3ee3d804 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/query/Manager.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/query/Manager.java @@ -8,12 +8,12 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/query/QueryDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/query/QueryDslIT.java index cd05d2075db..6185209396c 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/query/QueryDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/query/QueryDslIT.java @@ -16,10 +16,10 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.SharedCacheMode; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; @@ -308,7 +308,7 @@ public void searchQuery() { SearchQuery query = searchSession.search( Book.class ) // <1> .where( f -> f.matchAll() ) .toQuery(); // <2> - javax.persistence.TypedQuery jpaQuery = Search.toJpaQuery( query ); // <3> + jakarta.persistence.TypedQuery jpaQuery = Search.toJpaQuery( query ); // <3> org.hibernate.query.Query ormQuery = Search.toOrmQuery( query ); // <4> // end::searchQuery-toORM[] List hits = jpaQuery.getResultList(); diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/Author.java index d72ec9b8041..47ad5d5e106 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/Author.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/Author.java @@ -8,10 +8,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.engine.backend.types.Sortable; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/Book.java b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/Book.java index d5c50d2d675..b1b592654c6 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/Book.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/Book.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.engine.backend.types.Sortable; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/ElasticsearchSortDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/ElasticsearchSortDslIT.java index 84859ad47ad..18720a98444 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/ElasticsearchSortDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/ElasticsearchSortDslIT.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.elasticsearch.ElasticsearchExtension; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/EmbeddableGeoPoint.java b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/EmbeddableGeoPoint.java index 838ebf54767..2c84ffc0813 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/EmbeddableGeoPoint.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/EmbeddableGeoPoint.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.documentation.search.sort; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; import org.hibernate.search.engine.spatial.GeoPoint; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/LuceneSortDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/LuceneSortDslIT.java index 9464d823f96..d092970d270 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/LuceneSortDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/LuceneSortDslIT.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.lucene.LuceneExtension; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/SortDslIT.java b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/SortDslIT.java index ee3790b1cf8..5043de4a139 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/search/sort/SortDslIT.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/search/sort/SortDslIT.java @@ -12,7 +12,7 @@ import java.util.Arrays; import java.util.List; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java/org/hibernate/search/documentation/testsupport/data/ISBNAttributeConverter.java b/documentation/src/test/java/org/hibernate/search/documentation/testsupport/data/ISBNAttributeConverter.java index ba54b0c0f6c..7ca1bc882a4 100644 --- a/documentation/src/test/java/org/hibernate/search/documentation/testsupport/data/ISBNAttributeConverter.java +++ b/documentation/src/test/java/org/hibernate/search/documentation/testsupport/data/ISBNAttributeConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.documentation.testsupport.data; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; public class ISBNAttributeConverter implements AttributeConverter { diff --git a/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/Author.java b/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/Author.java index 0db53f4ba9a..476c29f77dc 100644 --- a/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/Author.java +++ b/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/Author.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/Book.java b/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/Book.java index a3b5b83babc..c47532e0e57 100644 --- a/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/Book.java +++ b/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/Book.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.engine.backend.types.Projectable; diff --git a/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/ProjectionConstructorMappingJava17IT.java b/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/ProjectionConstructorMappingJava17IT.java index e8650f4078b..0c097aed3fd 100644 --- a/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/ProjectionConstructorMappingJava17IT.java +++ b/documentation/src/test/java17/org/hibernate/search/documentation/mapper/orm/projection/ProjectionConstructorMappingJava17IT.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.documentation.testsupport.BackendConfigurations; import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper; diff --git a/documentation/src/test/java17/org/hibernate/search/documentation/search/projection/ProjectionDslJava17IT.java b/documentation/src/test/java17/org/hibernate/search/documentation/search/projection/ProjectionDslJava17IT.java index c5de7c373f1..14656056191 100644 --- a/documentation/src/test/java17/org/hibernate/search/documentation/search/projection/ProjectionDslJava17IT.java +++ b/documentation/src/test/java17/org/hibernate/search/documentation/search/projection/ProjectionDslJava17IT.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.search.documentation.testsupport.BackendConfigurations; diff --git a/documentation/src/test/resources/META-INF/persistence.xml b/documentation/src/test/resources/META-INF/persistence.xml index eae5613b258..e84ebd1c83e 100644 --- a/documentation/src/test/resources/META-INF/persistence.xml +++ b/documentation/src/test/resources/META-INF/persistence.xml @@ -5,9 +5,9 @@ ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later ~ See the lgpl.txt file in the root directory or . --> - + org.hibernate.search.documentation.mapper.orm.gettingstarted.withouthsearch.Author org.hibernate.search.documentation.mapper.orm.gettingstarted.withouthsearch.Book diff --git a/engine/src/main/java/org/hibernate/search/engine/environment/bean/BeanRetrieval.java b/engine/src/main/java/org/hibernate/search/engine/environment/bean/BeanRetrieval.java index 289aa1b57a5..ef1b1f3ccac 100644 --- a/engine/src/main/java/org/hibernate/search/engine/environment/bean/BeanRetrieval.java +++ b/engine/src/main/java/org/hibernate/search/engine/environment/bean/BeanRetrieval.java @@ -25,7 +25,7 @@ public enum BeanRetrieval { *

* Retrieve the bean from the bean manager (e.g. CDI, Spring, ...). * If a name is provided, it is interpreted as a bean name, - * for example assigned through {@code javax.inject.Named}. + * for example assigned through {@code jakarta.inject.Named}. */ BEAN, /** diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/module-info.java b/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/module-info.java index 0ce18c939a2..de9b64d55f8 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/module-info.java +++ b/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/module-info.java @@ -11,7 +11,7 @@ opens org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.config to org.hibernate.search.engine; // For reflective instantiation of the analysis configurer - requires java.persistence; + requires jakarta.persistence; requires org.hibernate.orm.core; requires org.hibernate.search.mapper.orm; requires org.hibernate.search.backend.elasticsearch; diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/Author.java b/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/Author.java index 58907b4c710..da214272ed6 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/Author.java +++ b/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.config.MyElasticsearchAnalysisConfigurer; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java b/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java index 9dcdc1e43df..0b375caa40e 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java +++ b/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integrationtest/java/modules/orm-elasticsearch/src/main/java/module-info.java b/integrationtest/java/modules/orm-elasticsearch/src/main/java/module-info.java index 09a4133367d..3bd5c117f35 100644 --- a/integrationtest/java/modules/orm-elasticsearch/src/main/java/module-info.java +++ b/integrationtest/java/modules/orm-elasticsearch/src/main/java/module-info.java @@ -11,7 +11,7 @@ opens org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.config to org.hibernate.search.engine; // For reflective instantiation of the analysis configurer - requires java.persistence; + requires jakarta.persistence; requires org.hibernate.orm.core; requires org.hibernate.search.mapper.orm; requires org.hibernate.search.backend.elasticsearch; diff --git a/integrationtest/java/modules/orm-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/entity/Author.java b/integrationtest/java/modules/orm-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/entity/Author.java index 4a8640ea78e..ffbf7ed40a9 100644 --- a/integrationtest/java/modules/orm-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/entity/Author.java +++ b/integrationtest/java/modules/orm-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/entity/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.config.MyElasticsearchAnalysisConfigurer; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integrationtest/java/modules/orm-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/entity/AuthorWithSlightlyDifferentIndex.java b/integrationtest/java/modules/orm-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/entity/AuthorWithSlightlyDifferentIndex.java index 49010102cdb..64ce5d7a3d7 100644 --- a/integrationtest/java/modules/orm-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/entity/AuthorWithSlightlyDifferentIndex.java +++ b/integrationtest/java/modules/orm-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/entity/AuthorWithSlightlyDifferentIndex.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integrationtest/java/modules/orm-lucene/src/main/java/module-info.java b/integrationtest/java/modules/orm-lucene/src/main/java/module-info.java index 27e34e2b7d5..237df74c7f4 100644 --- a/integrationtest/java/modules/orm-lucene/src/main/java/module-info.java +++ b/integrationtest/java/modules/orm-lucene/src/main/java/module-info.java @@ -11,7 +11,7 @@ opens org.hibernate.search.integrationtest.java.modules.orm.lucene.config to org.hibernate.search.engine; // For reflective instantiation of the analysis configurer - requires java.persistence; + requires jakarta.persistence; requires org.hibernate.orm.core; requires org.hibernate.search.mapper.orm; requires org.hibernate.search.backend.lucene; diff --git a/integrationtest/java/modules/orm-lucene/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/lucene/entity/Author.java b/integrationtest/java/modules/orm-lucene/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/lucene/entity/Author.java index c03d811bc47..af1623edfe3 100644 --- a/integrationtest/java/modules/orm-lucene/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/lucene/entity/Author.java +++ b/integrationtest/java/modules/orm-lucene/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/lucene/entity/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.java.modules.orm.lucene.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.integrationtest.java.modules.orm.lucene.config.MyLuceneAnalysisConfigurer; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integrationtest/mapper/orm-batch-jsr352/pom.xml b/integrationtest/mapper/orm-batch-jsr352/pom.xml index b457f22ddf1..26673fcbc48 100644 --- a/integrationtest/mapper/orm-batch-jsr352/pom.xml +++ b/integrationtest/mapper/orm-batch-jsr352/pom.xml @@ -117,7 +117,7 @@ org.hibernate.search:hibernate-search-backend-elasticsearch org.hibernate.search:hibernate-search-util-internal-integrationtest-jbatch-runtime - com.ibm.jbatch:com.ibm.jbatch-runtime + com.ibm.jbatch:com.ibm.jbatch.container lucene @@ -154,7 +154,7 @@ org.hibernate.search:hibernate-search-backend-lucene org.hibernate.search:hibernate-search-util-internal-integrationtest-jbatch-runtime - com.ibm.jbatch:com.ibm.jbatch-runtime + com.ibm.jbatch:com.ibm.jbatch.container elasticsearch diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/component/EntityReaderComponentIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/component/EntityReaderComponentIT.java index cea0e51fc4f..853751515a6 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/component/EntityReaderComponentIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/component/EntityReaderComponentIT.java @@ -14,9 +14,9 @@ import java.util.Arrays; import java.util.List; -import javax.batch.runtime.context.JobContext; -import javax.batch.runtime.context.StepContext; -import javax.persistence.EntityManagerFactory; +import jakarta.batch.runtime.context.JobContext; +import jakarta.batch.runtime.context.StepContext; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.CacheMode; import org.hibernate.search.batch.jsr352.core.massindexing.impl.JobContextData; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/component/HibernateSearchPartitionMapperComponentIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/component/HibernateSearchPartitionMapperComponentIT.java index 691a7338e26..68aaa59c474 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/component/HibernateSearchPartitionMapperComponentIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/component/HibernateSearchPartitionMapperComponentIT.java @@ -13,9 +13,9 @@ import java.util.Arrays; import java.util.Properties; -import javax.batch.api.partition.PartitionPlan; -import javax.batch.runtime.context.JobContext; -import javax.persistence.EntityManagerFactory; +import jakarta.batch.api.partition.PartitionPlan; +import jakarta.batch.runtime.context.JobContext; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.batch.jsr352.core.massindexing.impl.JobContextData; import org.hibernate.search.batch.jsr352.core.massindexing.step.impl.HibernateSearchPartitionMapper; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java index e45361128a8..e08397740d9 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java @@ -16,15 +16,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.batch.operations.JobOperator; -import javax.batch.runtime.BatchStatus; -import javax.batch.runtime.JobExecution; -import javax.batch.runtime.StepExecution; -import javax.persistence.EntityManagerFactory; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; +import jakarta.batch.operations.JobOperator; +import jakarta.batch.runtime.BatchStatus; +import jakarta.batch.runtime.JobExecution; +import jakarta.batch.runtime.StepExecution; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import org.hibernate.search.batch.jsr352.core.logging.impl.Log; import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java index 9c25d7ed105..9b24c192f31 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java @@ -12,10 +12,10 @@ import java.util.ArrayList; import java.util.List; -import javax.batch.operations.JobOperator; -import javax.batch.runtime.JobExecution; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.batch.operations.JobOperator; +import jakarta.batch.runtime.JobExecution; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob; import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Person; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java index 2a74f5155b6..575e7db021d 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java @@ -18,12 +18,12 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob; import org.hibernate.search.integrationtest.batch.jsr352.util.BackendConfigurations; @@ -49,8 +49,8 @@ /** * Tests that mass indexing job can handle entity having - * {@link javax.persistence.EmbeddedId} annotation, or - * {@link javax.persistence.IdClass} annotation. + * {@link jakarta.persistence.EmbeddedId} annotation, or + * {@link jakarta.persistence.IdClass} annotation. * * @author Mincong Huang */ diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithMultiTenancyIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithMultiTenancyIT.java index 60e09ab0e07..73735f8f57c 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithMultiTenancyIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithMultiTenancyIT.java @@ -12,9 +12,9 @@ import java.util.Arrays; import java.util.List; -import javax.batch.operations.JobOperator; -import javax.batch.runtime.BatchStatus; -import javax.batch.runtime.JobExecution; +import jakarta.batch.operations.JobOperator; +import jakarta.batch.runtime.BatchStatus; +import jakarta.batch.runtime.JobExecution; import org.hibernate.SessionFactory; import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/RestartChunkIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/RestartChunkIT.java index 25378d9c182..b6cdbcfe4e7 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/RestartChunkIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/RestartChunkIT.java @@ -12,16 +12,16 @@ import java.io.IOException; import java.util.List; import java.util.Properties; -import javax.batch.operations.JobOperator; -import javax.batch.runtime.BatchStatus; -import javax.batch.runtime.JobExecution; -import javax.batch.runtime.StepExecution; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.batch.operations.JobOperator; +import jakarta.batch.runtime.BatchStatus; +import jakarta.batch.runtime.JobExecution; +import jakarta.batch.runtime.StepExecution; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob; import org.hibernate.search.integrationtest.batch.jsr352.util.BackendConfigurations; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Company.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Company.java index 42673dce959..6f58a1f62c9 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Company.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Company.java @@ -7,9 +7,9 @@ package org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/CompanyGroup.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/CompanyGroup.java index 4a188fa1d38..551df77e39b 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/CompanyGroup.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/CompanyGroup.java @@ -9,9 +9,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Person.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Person.java index af5990d9cd7..3453f5a43f9 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Person.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Person.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/WhoAmI.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/WhoAmI.java index 319650b33a8..9456534d711 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/WhoAmI.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/WhoAmI.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/util/JobTestUtil.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/util/JobTestUtil.java index 0f5ce3432f9..1858e2172e8 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/util/JobTestUtil.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/util/JobTestUtil.java @@ -11,13 +11,13 @@ import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Properties; -import javax.batch.operations.JobOperator; -import javax.batch.runtime.BatchRuntime; -import javax.batch.runtime.BatchStatus; -import javax.batch.runtime.JobExecution; -import javax.persistence.EntityManagerFactory; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.batch.operations.JobOperator; +import jakarta.batch.runtime.BatchRuntime; +import jakarta.batch.runtime.BatchStatus; +import jakarta.batch.runtime.JobExecution; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/resources/META-INF/batch.xml b/integrationtest/mapper/orm-batch-jsr352/src/test/resources/META-INF/batch.xml index 02a0d9f8692..c9cbdfb27ac 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/resources/META-INF/batch.xml +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/resources/META-INF/batch.xml @@ -5,7 +5,7 @@ ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later ~ See the lgpl.txt file in the root directory or . --> - + - + org.hibernate.jpa.HibernatePersistenceProvider diff --git a/integrationtest/mapper/orm-cdi/pom.xml b/integrationtest/mapper/orm-cdi/pom.xml index 81571d5d7d0..93d943278d2 100644 --- a/integrationtest/mapper/orm-cdi/pom.xml +++ b/integrationtest/mapper/orm-cdi/pom.xml @@ -30,10 +30,10 @@ test - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api - ${version.javax.enterprise} + ${version.jakarta.enterprise} test diff --git a/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/CdiBeanResolutionIT.java b/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/CdiBeanResolutionIT.java index 5eddeb19cbb..0001e76925c 100644 --- a/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/CdiBeanResolutionIT.java +++ b/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/CdiBeanResolutionIT.java @@ -10,16 +10,16 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; diff --git a/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/CdiExtendedBeanManagerBootstrapShutdownIT.java b/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/CdiExtendedBeanManagerBootstrapShutdownIT.java index 41fb70c97e2..ec37ac7ec75 100644 --- a/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/CdiExtendedBeanManagerBootstrapShutdownIT.java +++ b/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/CdiExtendedBeanManagerBootstrapShutdownIT.java @@ -11,11 +11,11 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -290,7 +290,7 @@ public void setId(Integer id) { public static class DependentBean { public static final CounterKeys KEYS = new CounterKeys(); - protected DependentBean() { + public DependentBean() { StaticCounters.get().increment( KEYS.instantiate ); } diff --git a/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/StubExtendedBeanManager.java b/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/StubExtendedBeanManager.java index 87781dd84be..39bfb652fdc 100644 --- a/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/StubExtendedBeanManager.java +++ b/integrationtest/mapper/orm-cdi/src/test/java/org/hibernate/search/integrationtest/mapper/orm/cdi/StubExtendedBeanManager.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.hibernate.resource.beans.container.spi.ExtendedBeanManager; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingDisabledIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingDisabledIT.java index dbede206e19..ef59998f6f0 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingDisabledIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingDisabledIT.java @@ -11,10 +11,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingStrategyPropertyValueIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingStrategyPropertyValueIT.java index 41622ecbf4e..a3d83491fa3 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingStrategyPropertyValueIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingStrategyPropertyValueIT.java @@ -11,9 +11,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.metamodel.Type; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.metamodel.Type; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; import org.hibernate.search.engine.environment.bean.BeanReference; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java index 5f2e10cbbdc..dbb28be1792 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java @@ -14,9 +14,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.engine.reporting.EntityIndexingFailureContext; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java index aff40746ded..2be8724b5fa 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java index 164c16f58cd..0eaa1d3385a 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java index 82e57bb5d8b..6992f4a0ebb 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java @@ -11,10 +11,10 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.FilteringOutboxEventFinder; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java index 3891d2310e1..f654aadaeb4 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java @@ -14,9 +14,9 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.FilteringOutboxEventFinder; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java index 977c6811821..39d41ffbfed 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.function.UnaryOperator; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java index 1504a9e056d..7237f4b8354 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java @@ -11,9 +11,9 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.FilteringOutboxEventFinder; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java index 3cd9a29ce10..9bdf39fae63 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java @@ -11,8 +11,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.UnaryOperator; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java index 69f5318ad80..0f95a12ff3b 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java index 7cf088e84e7..11ecbf6769b 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java @@ -10,9 +10,9 @@ import static org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing.OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java index 255abcaa45d..20339f68d56 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java @@ -11,8 +11,8 @@ import java.util.Collections; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.Environment; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java index 0f2ed4c1a5a..146747fdbeb 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.function.UnaryOperator; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java index 1cfb0fab79b..2034a7b716c 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java @@ -11,8 +11,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java index b78045cf75a..41b3e434ce8 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java @@ -9,8 +9,8 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingCustomEntityMappingIT.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingCustomEntityMappingIT.java index 1a57d6a868e..0277e746efd 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingCustomEntityMappingIT.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingCustomEntityMappingIT.java @@ -18,9 +18,9 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.boot.MappingException; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/RoutedIndexedEntity.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/RoutedIndexedEntity.java index d9bfe1a1f74..3fa1283ce3b 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/RoutedIndexedEntity.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/RoutedIndexedEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.RoutingBinderRef; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/searchmapping/IndexedEntity.java b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/searchmapping/IndexedEntity.java index 31ef9119ca6..04c9233a01e 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/searchmapping/IndexedEntity.java +++ b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/searchmapping/IndexedEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing.searchmapping; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm-envers/pom.xml b/integrationtest/mapper/orm-envers/pom.xml index fb98fe89cd2..72ba2e1ff8a 100644 --- a/integrationtest/mapper/orm-envers/pom.xml +++ b/integrationtest/mapper/orm-envers/pom.xml @@ -24,7 +24,7 @@ org.hibernate - hibernate-envers + hibernate-envers-jakarta test diff --git a/integrationtest/mapper/orm-envers/src/test/java/org/hibernate/search/integrationtest/mapper/orm/envers/EnversIT.java b/integrationtest/mapper/orm-envers/src/test/java/org/hibernate/search/integrationtest/mapper/orm/envers/EnversIT.java index 8bb3aba2c97..a9ff5d8dc93 100644 --- a/integrationtest/mapper/orm-envers/src/test/java/org/hibernate/search/integrationtest/mapper/orm/envers/EnversIT.java +++ b/integrationtest/mapper/orm-envers/src/test/java/org/hibernate/search/integrationtest/mapper/orm/envers/EnversIT.java @@ -12,10 +12,10 @@ import java.util.Arrays; import java.util.Optional; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.SessionFactory; import org.hibernate.envers.AuditReader; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BackendTypeAutoDetectMultipleBackendTypesInClasspathIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BackendTypeAutoDetectMultipleBackendTypesInClasspathIT.java index d84196745ce..d7ee9b929d2 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BackendTypeAutoDetectMultipleBackendTypesInClasspathIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BackendTypeAutoDetectMultipleBackendTypesInClasspathIT.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BackendTypeAutoDetectSingleBackendTypeInClasspathIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BackendTypeAutoDetectSingleBackendTypeInClasspathIT.java index 32bd5bc76a6..aa42b566aad 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BackendTypeAutoDetectSingleBackendTypeInClasspathIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BackendTypeAutoDetectSingleBackendTypeInClasspathIT.java @@ -10,8 +10,8 @@ import static org.hibernate.search.util.impl.integrationtest.common.rule.BackendConfiguration.BACKEND_TYPE; import static org.hibernate.search.util.impl.integrationtest.common.rule.BackendConfiguration.IS_IDE; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BeanResolutionIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BeanResolutionIT.java index 815eb7f8788..73e72ad48f3 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BeanResolutionIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/bootstrap/BeanResolutionIT.java @@ -14,10 +14,10 @@ import static org.mockito.Mockito.when; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java index b3cb728842f..ddf6d1caacf 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java @@ -15,12 +15,12 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/massindexing/MassIndexingManualSchemaManagementIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/massindexing/MassIndexingManualSchemaManagementIT.java index 2a66eedac6b..9b2ef0dde62 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/massindexing/MassIndexingManualSchemaManagementIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/massindexing/MassIndexingManualSchemaManagementIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.integrationtest.mapper.orm.realbackend.util.BookCreatorUtils.prepareBooks; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations; import org.hibernate.search.integrationtest.mapper.orm.realbackend.util.Book; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/massindexing/MassIndexingMonitorIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/massindexing/MassIndexingMonitorIT.java index 86e1c0016f4..bdbb9d1a498 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/massindexing/MassIndexingMonitorIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/massindexing/MassIndexingMonitorIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.integrationtest.mapper.orm.realbackend.util.BookCreatorUtils.prepareBooks; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations; import org.hibernate.search.integrationtest.mapper.orm.realbackend.util.Book; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/multitenant/RealBackendDatabaseMultitenancyIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/multitenant/RealBackendDatabaseMultitenancyIT.java index e14b7a78495..aefe64d1a97 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/multitenant/RealBackendDatabaseMultitenancyIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/multitenant/RealBackendDatabaseMultitenancyIT.java @@ -11,8 +11,8 @@ import java.util.List; import java.util.function.Consumer; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/routing/RoutingBridgeConditionalIndexingIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/routing/RoutingBridgeConditionalIndexingIT.java index 4c23bd5f080..bcf6e7c52ab 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/routing/RoutingBridgeConditionalIndexingIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/routing/RoutingBridgeConditionalIndexingIT.java @@ -11,10 +11,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/routing/RoutingBridgeRoutingKeyIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/routing/RoutingBridgeRoutingKeyIT.java index a9d16284471..00810d713a1 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/routing/RoutingBridgeRoutingKeyIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/routing/RoutingBridgeRoutingKeyIT.java @@ -11,10 +11,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/sync/OutOfSyncIndexIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/sync/OutOfSyncIndexIT.java index 2e42c533c80..3e95eed6bf1 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/sync/OutOfSyncIndexIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/sync/OutOfSyncIndexIT.java @@ -11,7 +11,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.countAll; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations; import org.hibernate.search.integrationtest.mapper.orm.realbackend.util.Book; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/util/Book.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/util/Book.java index 8c984f845a0..e63bf7fae47 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/util/Book.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/util/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.realbackend.util; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/util/BookCreatorUtils.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/util/BookCreatorUtils.java index 1c6c58af03c..f24c5ceee0b 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/util/BookCreatorUtils.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/util/BookCreatorUtils.java @@ -9,7 +9,7 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.Locale; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/beanresolution/SpringBeanResolutionIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/beanresolution/SpringBeanResolutionIT.java index a52e85d4aa4..dbcc1fbeb54 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/beanresolution/SpringBeanResolutionIT.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/beanresolution/SpringBeanResolutionIT.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.engine.environment.bean.BeanHolder; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringIT.java index 1d6cf6d3b74..55d114f7163 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringIT.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringIT.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringMoreComplexIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringMoreComplexIT.java index 0718fae8aff..d1d31e1bdda 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringMoreComplexIT.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringMoreComplexIT.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringOutboxIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringOutboxIT.java index 8ae1c2792c7..cebc2409f5c 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringOutboxIT.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringOutboxIT.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/dao/BoxDAO.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/dao/BoxDAO.java index 9dc8282594e..6266e1a3e07 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/dao/BoxDAO.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/dao/BoxDAO.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.spring.jta.dao; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.hibernate.search.integrationtest.spring.jta.entity.Box; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/dao/SnertDAO.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/dao/SnertDAO.java index c2a9350c270..ea815191111 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/dao/SnertDAO.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/dao/SnertDAO.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.spring.jta.dao; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.hibernate.search.integrationtest.spring.jta.entity.Snert; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/AbstractEntity.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/AbstractEntity.java index 4cb930be9c0..302fbdae5dc 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/AbstractEntity.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/AbstractEntity.java @@ -7,8 +7,8 @@ package org.hibernate.search.integrationtest.spring.jta.entity; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.NaturalId; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Box.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Box.java index d9b1beb53b1..1ebc2a5e8f2 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Box.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Box.java @@ -8,10 +8,10 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Container.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Container.java index 94bd002ee96..9ad469b3fbe 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Container.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Container.java @@ -6,14 +6,14 @@ */ package org.hibernate.search.integrationtest.spring.jta.entity; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Doughnut.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Doughnut.java index 24f570e67bb..dcdd1edf6f3 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Doughnut.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Doughnut.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.integrationtest.spring.jta.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Muffin.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Muffin.java index e63ade6ecfb..7777d95eda0 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Muffin.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Muffin.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.integrationtest.spring.jta.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Snert.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Snert.java index f25a367d8f9..2518402bd96 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Snert.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/entity/Snert.java @@ -7,10 +7,10 @@ package org.hibernate.search.integrationtest.spring.jta.entity; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/RaisedTimeoutJtaAndSpringOutboxIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/RaisedTimeoutJtaAndSpringOutboxIT.java index d59399c6e53..d8dd0459474 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/RaisedTimeoutJtaAndSpringOutboxIT.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/RaisedTimeoutJtaAndSpringOutboxIT.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/TransactionTimeoutJtaAndSpringOutboxIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/TransactionTimeoutJtaAndSpringOutboxIT.java index bd7e8628000..8aa76070c6e 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/TransactionTimeoutJtaAndSpringOutboxIT.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/TransactionTimeoutJtaAndSpringOutboxIT.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/outbox/TransactionOutboxIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/outbox/TransactionOutboxIT.java index caded113a29..b425e88c2f8 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/outbox/TransactionOutboxIT.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/outbox/TransactionOutboxIT.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.spring.outbox; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; import org.hibernate.search.integrationtest.spring.testsupport.AbstractSpringITConfig; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/sessionproxy/SessionProxyIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/sessionproxy/SessionProxyIT.java index 29f0fd7f7dd..b7545ee1caf 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/sessionproxy/SessionProxyIT.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/sessionproxy/SessionProxyIT.java @@ -13,9 +13,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; import org.hibernate.search.integrationtest.spring.testsupport.AbstractSpringITConfig; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/transaction/TransactionIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/transaction/TransactionIT.java index 365bb452143..e1dcac04258 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/transaction/TransactionIT.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/transaction/TransactionIT.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.spring.transaction; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; import org.hibernate.search.integrationtest.spring.testsupport.AbstractSpringITConfig; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingBasicIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingBasicIT.java index 950f49b1d71..36103c00646 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingBasicIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingBasicIT.java @@ -9,9 +9,9 @@ import static org.junit.Assume.assumeTrue; import java.util.function.Consumer; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Transaction; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingConcurrentModificationInDifferentTypeIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingConcurrentModificationInDifferentTypeIT.java index 6cf513458a5..8f72a074f9a 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingConcurrentModificationInDifferentTypeIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingConcurrentModificationInDifferentTypeIT.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.integrationtest.mapper.orm.automaticindexing; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingConcurrentModificationInSameTypeIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingConcurrentModificationInSameTypeIT.java index 75700be5be8..55818f82227 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingConcurrentModificationInSameTypeIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingConcurrentModificationInSameTypeIT.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.integrationtest.mapper.orm.automaticindexing; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingElementCollectionIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingElementCollectionIT.java index abfd45d53ba..e139ecc952d 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingElementCollectionIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingElementCollectionIT.java @@ -9,12 +9,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingEmbeddableIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingEmbeddableIT.java index b3a5de45c29..1b4a113bd05 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingEmbeddableIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingEmbeddableIT.java @@ -8,21 +8,21 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.AssociationOverride; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; import org.hibernate.cfg.AvailableSettings; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.AssociationInverseSide; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingEnabledIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingEnabledIT.java index ae63ada1fe6..7d982eea9e4 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingEnabledIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingEnabledIT.java @@ -8,9 +8,9 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingMappedSuperclassIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingMappedSuperclassIT.java index b3e0271a254..96122c930da 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingMappedSuperclassIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingMappedSuperclassIT.java @@ -8,13 +8,13 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingMultiTenancyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingMultiTenancyIT.java index 4e764d8488a..9771f2f983f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingMultiTenancyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingMultiTenancyIT.java @@ -9,8 +9,8 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingNonEntityIdDocumentIdIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingNonEntityIdDocumentIdIT.java index 8c952e18863..39c75a8a16d 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingNonEntityIdDocumentIdIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingNonEntityIdDocumentIdIT.java @@ -9,11 +9,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingOverReindexingIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingOverReindexingIT.java index 3dd888c9e56..f780860724c 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingOverReindexingIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingOverReindexingIT.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.integrationtest.mapper.orm.automaticindexing; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.engine.backend.document.DocumentElement; import org.hibernate.search.engine.backend.document.IndexFieldReference; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingRoutingBridgeConditionalIndexingIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingRoutingBridgeConditionalIndexingIT.java index 29f5fbd1de0..26ad87c0d72 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingRoutingBridgeConditionalIndexingIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingRoutingBridgeConditionalIndexingIT.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.mapper.orm.automaticindexing; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; import org.hibernate.search.mapper.pojo.bridge.RoutingBridge; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingRoutingBridgeRoutingKeyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingRoutingBridgeRoutingKeyIT.java index 4b72810c0fe..c3782d2b221 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingRoutingBridgeRoutingKeyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingRoutingBridgeRoutingKeyIT.java @@ -7,9 +7,9 @@ package org.hibernate.search.integrationtest.mapper.orm.automaticindexing; import java.util.Locale; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; import org.hibernate.search.mapper.pojo.bridge.RoutingBridge; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingBooleanArrayIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingBooleanArrayIT.java index babd9ee5132..b0a91acdfda 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingBooleanArrayIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingBooleanArrayIT.java @@ -8,10 +8,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingByteArrayIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingByteArrayIT.java index 732ca0d692d..6cb48fb36d5 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingByteArrayIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingByteArrayIT.java @@ -8,10 +8,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingCharArrayIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingCharArrayIT.java index 018cfcd5d98..3dcc95796fd 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingCharArrayIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingCharArrayIT.java @@ -8,10 +8,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingDoubleArrayIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingDoubleArrayIT.java index 66eceda16df..68872d144a6 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingDoubleArrayIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingDoubleArrayIT.java @@ -8,10 +8,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingFloatArrayIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingFloatArrayIT.java index 3d195938d4f..1166f292ffc 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingFloatArrayIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingFloatArrayIT.java @@ -8,10 +8,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingIntArrayIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingIntArrayIT.java index 2f88a020e17..b7b8c6567cf 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingIntArrayIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingIntArrayIT.java @@ -8,10 +8,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingLongArrayIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingLongArrayIT.java index 33f9f6008a3..b4ef90515ee 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingLongArrayIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingLongArrayIT.java @@ -8,10 +8,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingShortArrayIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingShortArrayIT.java index 41ea0d251d2..6a5b0666f79 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingShortArrayIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingShortArrayIT.java @@ -8,10 +8,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingStringArrayIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingStringArrayIT.java index db6ce6682ca..78983115027 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingStringArrayIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingStringArrayIT.java @@ -8,10 +8,10 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingAssociationDeletionIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingAssociationDeletionIT.java index 6519a8f6cbd..fe2781a23d9 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingAssociationDeletionIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingAssociationDeletionIT.java @@ -9,19 +9,19 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingGenericPolymorphicAssociationIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingGenericPolymorphicAssociationIT.java index a533b7c1a44..85b9dabde14 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingGenericPolymorphicAssociationIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingGenericPolymorphicAssociationIT.java @@ -10,14 +10,14 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Transient; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingPolymorphicInverseSideAssociationIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingPolymorphicInverseSideAssociationIT.java index fd153245670..66d3ab34339 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingPolymorphicInverseSideAssociationIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingPolymorphicInverseSideAssociationIT.java @@ -10,14 +10,14 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Transient; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingPolymorphicOriginalSideAssociationIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingPolymorphicOriginalSideAssociationIT.java index 88c992af18a..c747700f4c6 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingPolymorphicOriginalSideAssociationIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/AutomaticIndexingPolymorphicOriginalSideAssociationIT.java @@ -8,15 +8,15 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontained/AutomaticIndexingManyToManyOwnedByContainedCollectionBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontained/AutomaticIndexingManyToManyOwnedByContainedCollectionBaseIT.java index 92dce3352ec..7944d1c684b 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontained/AutomaticIndexingManyToManyOwnedByContainedCollectionBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontained/AutomaticIndexingManyToManyOwnedByContainedCollectionBaseIT.java @@ -11,20 +11,20 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontained/AutomaticIndexingManyToManyOwnedByContainedListBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontained/AutomaticIndexingManyToManyOwnedByContainedListBaseIT.java index d5263a97f2b..95867d1e3ed 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontained/AutomaticIndexingManyToManyOwnedByContainedListBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontained/AutomaticIndexingManyToManyOwnedByContainedListBaseIT.java @@ -10,20 +10,20 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingCollectionBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingCollectionBaseIT.java index 3131766b3a9..19be468a2ae 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingCollectionBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingCollectionBaseIT.java @@ -11,20 +11,20 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingListBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingListBaseIT.java index e3907060f88..3793767d690 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingListBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingListBaseIT.java @@ -10,20 +10,20 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingMapKeysBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingMapKeysBaseIT.java index 3acc5933856..f4d9ab32591 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingMapKeysBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingMapKeysBaseIT.java @@ -12,22 +12,22 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyClass; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingMapValuesBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingMapValuesBaseIT.java index a1203cfe695..3d9a8972a36 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingMapValuesBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingMapValuesBaseIT.java @@ -12,21 +12,21 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingSortedMapValuesBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingSortedMapValuesBaseIT.java index de5af1fa6a8..6f4a2881d7f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingSortedMapValuesBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingSortedMapValuesBaseIT.java @@ -12,21 +12,21 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.annotations.SortNatural; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingSortedSetBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingSortedSetBaseIT.java index a9a0dc0e16f..71782e04a05 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingSortedSetBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany/ownedbycontaining/AutomaticIndexingManyToManyOwnedByContainingSortedSetBaseIT.java @@ -12,20 +12,20 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.annotations.SortNatural; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytoone/AutomaticIndexingManyToOneBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytoone/AutomaticIndexingManyToOneBaseIT.java index 0bfee9ca191..641b2c86622 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytoone/AutomaticIndexingManyToOneBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytoone/AutomaticIndexingManyToOneBaseIT.java @@ -10,22 +10,22 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingSingleValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetomany/AutomaticIndexingOneToManyCollectionBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetomany/AutomaticIndexingOneToManyCollectionBaseIT.java index 94521c384da..cf6708a1b19 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetomany/AutomaticIndexingOneToManyCollectionBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetomany/AutomaticIndexingOneToManyCollectionBaseIT.java @@ -11,21 +11,21 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetomany/AutomaticIndexingOneToManyListBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetomany/AutomaticIndexingOneToManyListBaseIT.java index e246830ffd8..aadc693c82a 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetomany/AutomaticIndexingOneToManyListBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetomany/AutomaticIndexingOneToManyListBaseIT.java @@ -10,21 +10,21 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingMultiValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedEagerOnBothSidesIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedEagerOnBothSidesIT.java index b91664c96cf..7f186e91e42 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedEagerOnBothSidesIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedEagerOnBothSidesIT.java @@ -10,17 +10,17 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.cfg.AvailableSettings; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingSingleValuedAssociationBaseIT; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainedSideIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainedSideIT.java index a9bf08123e2..e17cd882d82 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainedSideIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainedSideIT.java @@ -13,18 +13,18 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingSingleValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainingSideIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainingSideIT.java index f0e70c361b2..2a43f25e1c3 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainingSideIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainingSideIT.java @@ -13,18 +13,18 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingSingleValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingEagerOnBothSidesIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingEagerOnBothSidesIT.java index df61d1c46ec..cf360d92dee 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingEagerOnBothSidesIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingEagerOnBothSidesIT.java @@ -10,18 +10,18 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.cfg.AvailableSettings; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingSingleValuedAssociationBaseIT; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT.java index 23277397c18..4109ed9ed8f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT.java @@ -13,19 +13,19 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingSingleValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainingSideIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainingSideIT.java index 102600d6e43..2e6712758ec 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainingSideIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/onetoone/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainingSideIT.java @@ -13,19 +13,19 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Transient; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.AbstractAutomaticIndexingSingleValuedAssociationBaseIT; import org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.ContainerPrimitives; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AbstractAutomaticIndexingBridgeIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AbstractAutomaticIndexingBridgeIT.java index 9e61812fdf4..1f89652ffbc 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AbstractAutomaticIndexingBridgeIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AbstractAutomaticIndexingBridgeIT.java @@ -11,14 +11,14 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AutomaticIndexingBridgeExplicitReindexingFunctionalIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AutomaticIndexingBridgeExplicitReindexingFunctionalIT.java index 0e021f54f86..32d80aac194 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AutomaticIndexingBridgeExplicitReindexingFunctionalIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AutomaticIndexingBridgeExplicitReindexingFunctionalIT.java @@ -10,9 +10,9 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.runInTransaction; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AutomaticIndexingEmbeddedBridgeIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AutomaticIndexingEmbeddedBridgeIT.java index c0d95f3208a..9075df4acf5 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AutomaticIndexingEmbeddedBridgeIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/AutomaticIndexingEmbeddedBridgeIT.java @@ -10,13 +10,13 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.document.DocumentElement; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/ContainedInThroughNonContainingIndexedTypeIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/ContainedInThroughNonContainingIndexedTypeIT.java index d1063975997..17eff0f3dd1 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/ContainedInThroughNonContainingIndexedTypeIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/bridge/ContainedInThroughNonContainingIndexedTypeIT.java @@ -8,9 +8,9 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.document.DocumentElement; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/ContainedInTriggerUnnecessaryCollectionInitializationIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/ContainedInTriggerUnnecessaryCollectionInitializationIT.java index d0da77c80df..902615812e2 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/ContainedInTriggerUnnecessaryCollectionInitializationIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/ContainedInTriggerUnnecessaryCollectionInitializationIT.java @@ -13,10 +13,10 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/IndexingProcessorProxiedAssociatedEntityIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/IndexingProcessorProxiedAssociatedEntityIT.java index bb32320efcb..0217143af39 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/IndexingProcessorProxiedAssociatedEntityIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/IndexingProcessorProxiedAssociatedEntityIT.java @@ -10,14 +10,14 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.proxy.HibernateProxy; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/ReindexingResolverProxiedAssociatedEntityIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/ReindexingResolverProxiedAssociatedEntityIT.java index 491a71d72ab..db6d09a4971 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/ReindexingResolverProxiedAssociatedEntityIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/proxy/ReindexingResolverProxiedAssociatedEntityIT.java @@ -10,15 +10,15 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; import org.hibernate.proxy.HibernateProxy; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingIdentiferRollbackIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingIdentiferRollbackIT.java index f08ea93206c..18b30c53ae9 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingIdentiferRollbackIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingIdentiferRollbackIT.java @@ -9,9 +9,9 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingOutOfTransactionIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingOutOfTransactionIT.java index b66194f973c..d8d3dc71659 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingOutOfTransactionIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingOutOfTransactionIT.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.session; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingSessionFlushIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingSessionFlushIT.java index 51a4db454dc..3e4d9dd937f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingSessionFlushIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingSessionFlushIT.java @@ -9,8 +9,8 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingSynchronizationStrategyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingSynchronizationStrategyIT.java index 27270b5fc21..8924ad4534c 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingSynchronizationStrategyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/AutomaticIndexingSynchronizationStrategyIT.java @@ -19,9 +19,9 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.HibernateException; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/FlushClearEvictAllIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/FlushClearEvictAllIT.java index 1822c9b1965..767464177c1 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/FlushClearEvictAllIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/session/FlushClearEvictAllIT.java @@ -11,19 +11,19 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/BootstrapFailureIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/BootstrapFailureIT.java index 9971d07ad0d..631bd8e5826 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/BootstrapFailureIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/BootstrapFailureIT.java @@ -8,9 +8,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/BootstrapLogsIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/BootstrapLogsIT.java index 2f9a268109d..ddcee3e664e 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/BootstrapLogsIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/BootstrapLogsIT.java @@ -9,9 +9,9 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.engine.Version; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/HibernateOrmIntegrationBooterIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/HibernateOrmIntegrationBooterIT.java index 1454f95e6b0..4a41d95125b 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/HibernateOrmIntegrationBooterIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/HibernateOrmIntegrationBooterIT.java @@ -17,8 +17,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.boot.Metadata; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/ObsoletePropertiesIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/ObsoletePropertiesIT.java index 74aeab6543f..daf3fe479dc 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/ObsoletePropertiesIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/ObsoletePropertiesIT.java @@ -14,9 +14,9 @@ import java.util.function.Consumer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/ShutdownFailureIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/ShutdownFailureIT.java index 258777aa1ca..22dca82885e 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/ShutdownFailureIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/ShutdownFailureIT.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.bootstrap; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.pojo.bridge.ValueBridge; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/UnusedPropertiesIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/UnusedPropertiesIT.java index 44fb927beb7..fbb65cc6b55 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/UnusedPropertiesIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/bootstrap/UnusedPropertiesIT.java @@ -7,9 +7,9 @@ package org.hibernate.search.integrationtest.mapper.orm.bootstrap; import java.util.function.Consumer; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.search.engine.cfg.EngineSettings; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmQueryIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmQueryIT.java index 24c034644b8..82045a2c337 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmQueryIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmQueryIT.java @@ -15,14 +15,14 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedEntityGraph; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.QueryTimeoutException; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.QueryTimeoutException; import org.hibernate.graph.GraphSemantic; import org.hibernate.query.Query; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmScrollableResultsIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmScrollableResultsIT.java index 23fa807e52f..e556ccaf667 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmScrollableResultsIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmScrollableResultsIT.java @@ -14,9 +14,9 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.QueryTimeoutException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.QueryTimeoutException; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; @@ -1060,7 +1060,7 @@ public void timeout() { backendMock.expectScrollObjects( Collections.singletonList( IndexedEntity.NAME ), DEFAULT_FETCH_SIZE, b -> b.failAfter( 200, TimeUnit.MILLISECONDS ) ); try ( ScrollableResults scroll = createSimpleQuery( session ) - .setHint( "javax.persistence.query.timeout", 200 ) + .setHint( "jakarta.persistence.query.timeout", 200 ) .scroll() ) { backendMock.verifyExpectationsMet(); diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmSessionIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmSessionIT.java index bc57cbaa3c1..ebd57770c41 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmSessionIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmSessionIT.java @@ -10,8 +10,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.Arrays; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.search.engine.search.query.SearchQuery; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToJpaEntityManagerIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToJpaEntityManagerIT.java index 5425b852841..15c70174701 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToJpaEntityManagerIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToJpaEntityManagerIT.java @@ -9,9 +9,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; import org.hibernate.search.engine.search.query.SearchQuery; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToJpaQueryIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToJpaQueryIT.java index 53732067d37..bdfd09b508e 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToJpaQueryIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToJpaQueryIT.java @@ -16,17 +16,17 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.QueryTimeoutException; -import javax.persistence.TypedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.QueryTimeoutException; +import jakarta.persistence.TypedQuery; import org.hibernate.cfg.AvailableSettings; import org.hibernate.graph.GraphSemantic; @@ -287,7 +287,7 @@ public void timeout_jpaHint() { SearchSession searchSession = Search.session( entityManager ); TypedQuery query = Search.toJpaQuery( createSimpleQuery( searchSession ) ); - query.setHint( "javax.persistence.query.timeout", 200 ); + query.setHint( "jakarta.persistence.query.timeout", 200 ); SearchTimeoutException timeoutException = new SearchTimeoutException( "Timed out" ); @@ -315,7 +315,7 @@ public void timeout_override() { .toQuery() ); - query.setHint( "javax.persistence.query.timeout", 200 ); + query.setHint( "jakarta.persistence.query.timeout", 200 ); SearchTimeoutException timeoutException = new SearchTimeoutException( "Timed out" ); @@ -339,7 +339,7 @@ public void graph_jpaHint_fetch() { SearchSession searchSession = Search.session( entityManager ); TypedQuery query = Search.toOrmQuery( createSimpleQuery( searchSession ) ); - query.setHint( "javax.persistence.fetchgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_EAGER ) ); + query.setHint( "jakarta.persistence.fetchgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_EAGER ) ); backendMock.expectSearchObjects( IndexedEntity.NAME, @@ -355,7 +355,7 @@ public void graph_jpaHint_fetch() { SearchSession searchSession = Search.session( entityManager ); TypedQuery query = Search.toOrmQuery( createSimpleQuery( searchSession ) ); - query.setHint( "javax.persistence.fetchgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_LAZY ) ); + query.setHint( "jakarta.persistence.fetchgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_LAZY ) ); backendMock.expectSearchObjects( IndexedEntity.NAME, @@ -376,7 +376,7 @@ public void graph_jpaHint_load() { SearchSession searchSession = Search.session( entityManager ); TypedQuery query = Search.toOrmQuery( createSimpleQuery( searchSession ) ); - query.setHint( "javax.persistence.loadgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_EAGER ) ); + query.setHint( "jakarta.persistence.loadgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_EAGER ) ); backendMock.expectSearchObjects( Arrays.asList( IndexedEntity.NAME ), b -> { }, @@ -392,7 +392,7 @@ public void graph_jpaHint_load() { SearchSession searchSession = Search.session( entityManager ); TypedQuery query = Search.toOrmQuery( createSimpleQuery( searchSession ) ); - query.setHint( "javax.persistence.loadgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_LAZY ) ); + query.setHint( "jakarta.persistence.loadgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_LAZY ) ); backendMock.expectSearchObjects( IndexedEntity.NAME, @@ -417,7 +417,7 @@ public void graph_override_jpaHint() { .toQuery() ); - query.setHint( "javax.persistence.fetchgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_LAZY ) ); + query.setHint( "jakarta.persistence.fetchgraph", entityManager.getEntityGraph( IndexedEntity.GRAPH_LAZY ) ); backendMock.expectSearchObjects( IndexedEntity.NAME, diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToSearchSessionFromSessionProxyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToSearchSessionFromSessionProxyIT.java index 72a8c71f889..09d5043f62f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToSearchSessionFromSessionProxyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/hibernateormapis/ToSearchSessionFromSessionProxyIT.java @@ -16,8 +16,8 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.SharedSessionContract; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/SearchMappingIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/SearchMappingIT.java index a83cb5d904d..d82cef25cf3 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/SearchMappingIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/SearchMappingIT.java @@ -14,10 +14,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.search.engine.backend.Backend; import org.hibernate.search.engine.backend.index.IndexManager; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/SearchMappingNoDefaultBackendIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/SearchMappingNoDefaultBackendIT.java index 065f7ce28f6..4867c7e2486 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/SearchMappingNoDefaultBackendIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/SearchMappingNoDefaultBackendIT.java @@ -11,10 +11,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.mapping.SearchMapping; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/definition/AnnotationMappingDiscoveryIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/definition/AnnotationMappingDiscoveryIT.java index 5a6699aab06..0031e756c5f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/definition/AnnotationMappingDiscoveryIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/definition/AnnotationMappingDiscoveryIT.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.search.engine.backend.document.DocumentElement; import org.hibernate.search.engine.backend.document.IndexObjectFieldReference; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/definition/HibernateOrmSearchMappingConfigurerIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/definition/HibernateOrmSearchMappingConfigurerIT.java index ca990ace044..a433187b3e7 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/definition/HibernateOrmSearchMappingConfigurerIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/mapping/definition/HibernateOrmSearchMappingConfigurerIT.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.mapping.definition; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; import org.hibernate.search.mapper.orm.mapping.HibernateOrmMappingConfigurationContext; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/AbstractMassIndexingErrorIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/AbstractMassIndexingErrorIT.java index 763b22608b9..72240967632 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/AbstractMassIndexingErrorIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/AbstractMassIndexingErrorIT.java @@ -14,8 +14,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.BaseSessionEventListener; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/AbstractMassIndexingFailureIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/AbstractMassIndexingFailureIT.java index 06bfb86732a..5cc62512cdb 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/AbstractMassIndexingFailureIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/AbstractMassIndexingFailureIT.java @@ -14,8 +14,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.BaseSessionEventListener; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingBaseIT.java index 8a28082db47..bbe45867d10 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingBaseIT.java @@ -11,9 +11,9 @@ import java.util.Collections; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingCachingIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingCachingIT.java index bb6b81b011b..c032664bb97 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingCachingIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingCachingIT.java @@ -9,10 +9,10 @@ import static org.assertj.core.api.Fail.fail; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SharedCacheMode; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.Table; import org.hibernate.CacheMode; import org.hibernate.cfg.AvailableSettings; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingComplexHierarchyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingComplexHierarchyIT.java index 8dd81ecb1a0..61df45bede6 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingComplexHierarchyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingComplexHierarchyIT.java @@ -8,8 +8,8 @@ import static org.assertj.core.api.Fail.fail; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingConditionalExpressionsIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingConditionalExpressionsIT.java index bf4534a7283..d891a6cee75 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingConditionalExpressionsIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingConditionalExpressionsIT.java @@ -9,11 +9,11 @@ import static org.junit.Assert.fail; import java.time.Instant; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingEmbeddedIdIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingEmbeddedIdIT.java index c9bd269973b..ca8d1363b0e 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingEmbeddedIdIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingEmbeddedIdIT.java @@ -11,10 +11,10 @@ import java.io.Serializable; import java.util.UUID; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingIdClassIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingIdClassIT.java index 83be31ea0d5..60715950f73 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingIdClassIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingIdClassIT.java @@ -10,9 +10,9 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingInterruptionIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingInterruptionIT.java index cca29cdf1a1..d40a4b02083 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingInterruptionIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingInterruptionIT.java @@ -13,9 +13,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingMonitorIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingMonitorIT.java index ac764578e17..0e9ab6f0a19 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingMonitorIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingMonitorIT.java @@ -11,9 +11,9 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.concurrent.CompletableFuture; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingNonEntityIdDocumentIdIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingNonEntityIdDocumentIdIT.java index 18f2dd6a077..2dbc49f23c2 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingNonEntityIdDocumentIdIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingNonEntityIdDocumentIdIT.java @@ -9,9 +9,9 @@ import static org.assertj.core.api.Fail.fail; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingPrimitiveIdIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingPrimitiveIdIT.java index d262bf417f0..f2ac9e59838 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingPrimitiveIdIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/massindexing/MassIndexingPrimitiveIdIT.java @@ -9,9 +9,9 @@ import static org.assertj.core.api.Fail.fail; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/AnnotationMappingAccessTypeIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/AnnotationMappingAccessTypeIT.java index ee2f2382380..915182706a3 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/AnnotationMappingAccessTypeIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/AnnotationMappingAccessTypeIT.java @@ -10,19 +10,19 @@ import static org.junit.Assert.fail; import java.io.Serializable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; @@ -271,7 +271,7 @@ public static class IndexedEntityWithoutIdSetter { } - @javax.persistence.Embeddable + @jakarta.persistence.Embeddable @Access( AccessType.FIELD ) public static class EmbeddableWithDefaultFieldAccess { @Basic @@ -301,7 +301,7 @@ public void setFieldWithNonDefaultMethodAccess(String value) { } } - @javax.persistence.Embeddable + @jakarta.persistence.Embeddable @Access( AccessType.PROPERTY ) public static class EmbeddableWithDefaultMethodAccess { @Access( AccessType.FIELD ) diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BackRefPropertyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BackRefPropertyIT.java index 00f0b5d1b39..6af91cdb9fe 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BackRefPropertyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BackRefPropertyIT.java @@ -11,12 +11,12 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.SessionFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BindingUsingPropertyMarkerAccessIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BindingUsingPropertyMarkerAccessIT.java index 7204bb41ca5..9ff515d81c2 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BindingUsingPropertyMarkerAccessIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BindingUsingPropertyMarkerAccessIT.java @@ -8,8 +8,8 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.types.Projectable; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BytecodeEnhancementIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BytecodeEnhancementIT.java index 7ad99a955ec..993d871f39b 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BytecodeEnhancementIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BytecodeEnhancementIT.java @@ -17,18 +17,18 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.Basic; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; import org.hibernate.SessionFactory; import org.hibernate.annotations.LazyGroup; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/DefaultDecimalScaleMappingIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/DefaultDecimalScaleMappingIT.java index a535cfe7321..cac073a61ae 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/DefaultDecimalScaleMappingIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/DefaultDecimalScaleMappingIT.java @@ -8,9 +8,9 @@ import java.math.BigDecimal; import java.math.BigInteger; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/FilteredAssociationIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/FilteredAssociationIT.java index ec9952f6c7a..69ee48132e3 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/FilteredAssociationIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/FilteredAssociationIT.java @@ -11,11 +11,11 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.AssociationInverseSide; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/GenericPropertyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/GenericPropertyIT.java index 770582ba73d..f3c50122f57 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/GenericPropertyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/GenericPropertyIT.java @@ -10,11 +10,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/IdClassIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/IdClassIT.java index 17c16079c26..a53cfd3733c 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/IdClassIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/IdClassIT.java @@ -11,9 +11,9 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/IdDerivedFromAssociationIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/IdDerivedFromAssociationIT.java index 59794f7c01f..a5582743470 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/IdDerivedFromAssociationIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/IdDerivedFromAssociationIT.java @@ -10,12 +10,12 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/JpaIdAsDocumentIdIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/JpaIdAsDocumentIdIT.java index f46f8ad0cd7..4ed920ef623 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/JpaIdAsDocumentIdIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/JpaIdAsDocumentIdIT.java @@ -10,11 +10,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.types.Projectable; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/MappedSuperclassIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/MappedSuperclassIT.java index 3a23cb32578..ed1cf7c5b83 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/MappedSuperclassIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/MappedSuperclassIT.java @@ -8,9 +8,9 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/ProgrammaticMappingAccessTypeIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/ProgrammaticMappingAccessTypeIT.java index ddd0bda929f..6dd6e079a5c 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/ProgrammaticMappingAccessTypeIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/ProgrammaticMappingAccessTypeIT.java @@ -10,19 +10,19 @@ import static org.junit.Assert.fail; import java.io.Serializable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; @@ -297,7 +297,7 @@ public static class IndexedEntityWithoutIdSetter { } - @javax.persistence.Embeddable + @jakarta.persistence.Embeddable @Access( AccessType.FIELD ) public static class EmbeddableWithDefaultFieldAccess { @Basic @@ -325,7 +325,7 @@ public void setFieldWithNonDefaultMethodAccess(String value) { } } - @javax.persistence.Embeddable + @jakarta.persistence.Embeddable @Access( AccessType.PROPERTY ) public static class EmbeddableWithDefaultMethodAccess { @Access( AccessType.FIELD ) diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/PropertyInheritanceIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/PropertyInheritanceIT.java index c032c2cdbbd..005e629e177 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/PropertyInheritanceIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/PropertyInheritanceIT.java @@ -10,10 +10,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/ProxyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/ProxyIT.java index 5d0f4a34975..fcd6393cbea 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/ProxyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/ProxyIT.java @@ -9,9 +9,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Hibernate; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/SyntheticPropertyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/SyntheticPropertyIT.java index 1b285ddf94d..3669e15c62f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/SyntheticPropertyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/SyntheticPropertyIT.java @@ -12,11 +12,11 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.SessionFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/TransientPropertyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/TransientPropertyIT.java index fd251a0d2dc..c550b268874 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/TransientPropertyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/TransientPropertyIT.java @@ -9,10 +9,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.document.DocumentElement; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/multitenancy/Clock.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/multitenancy/Clock.java index af4c70ec495..2a8437bb5c4 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/multitenancy/Clock.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/multitenancy/Clock.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.multitenancy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/manager/AbstractSearchSchemaManagerSimpleOperationIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/manager/AbstractSearchSchemaManagerSimpleOperationIT.java index b3d83acfb98..0fcf57c2571 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/manager/AbstractSearchSchemaManagerSimpleOperationIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/manager/AbstractSearchSchemaManagerSimpleOperationIT.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.concurrent.CompletableFuture; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/strategy/AbstractSchemaManagementStrategyIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/strategy/AbstractSchemaManagementStrategyIT.java index 903059903ae..0d6a86ee161 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/strategy/AbstractSchemaManagementStrategyIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/strategy/AbstractSchemaManagementStrategyIT.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.concurrent.CompletableFuture; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/strategy/SchemaManagementStrategyNoneIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/strategy/SchemaManagementStrategyNoneIT.java index 5e260e4bd77..e2a2a668ad3 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/strategy/SchemaManagementStrategyNoneIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/schema/management/strategy/SchemaManagementStrategyNoneIT.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.schema.management.strategy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/scope/ScopeExtensionIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/scope/ScopeExtensionIT.java index 6c7b65357a5..0b9d464e58e 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/scope/ScopeExtensionIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/scope/ScopeExtensionIT.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.scope.spi.IndexScope; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/SearchQueryBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/SearchQueryBaseIT.java index 7ab40ef9b77..60ae55548fa 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/SearchQueryBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/SearchQueryBaseIT.java @@ -17,10 +17,10 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.search.engine.search.aggregation.AggregationKey; import org.hibernate.search.engine.search.aggregation.SearchAggregation; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityChangingScrollingIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityChangingScrollingIT.java index 18ef2132ef5..da55275b004 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityChangingScrollingIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityChangingScrollingIT.java @@ -15,8 +15,8 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingCacheLookupIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingCacheLookupIT.java index 4e1533d8b1e..d59ed9252b0 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingCacheLookupIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingCacheLookupIT.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.Hibernate; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingMultipleTypesIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingMultipleTypesIT.java index ca8c795e692..fdef5e495a3 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingMultipleTypesIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingMultipleTypesIT.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingNonUniqueDocumentIdIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingNonUniqueDocumentIdIT.java index 12f3d7f76b5..bb20a4e86f4 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingNonUniqueDocumentIdIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingNonUniqueDocumentIdIT.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A_B.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A_B.java index 11dab27e31d..a6b7fab1dde 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A_B.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A_B.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A_C.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A_C.java index 4a09ee9c7e3..cbfaaeb995f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A_C.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A_C.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A__Abstract.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A__Abstract.java index c9f6bd456ef..fc04e803fa3 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A__Abstract.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy1_A__Abstract.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity(name = Hierarchy1_A__Abstract.NAME) public abstract class Hierarchy1_A__Abstract { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A_B.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A_B.java index 1a8d29b2f80..853da828ab3 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A_B.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A_B.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A_C.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A_C.java index 67894df5018..1f8c1f1d3db 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A_C.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A_C.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A__NonAbstract_Indexed.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A__NonAbstract_Indexed.java index 21638e4a1b4..73376050b42 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A__NonAbstract_Indexed.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy2_A__NonAbstract_Indexed.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A_B.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A_B.java index 3eac29610aa..121042dceab 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A_B.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A_B.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A_C.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A_C.java index 20eea12b875..3bb82d23e3e 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A_C.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A_C.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A__NonAbstract_NonIndexed.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A__NonAbstract_NonIndexed.java index 27d0cdb33d1..b72a967ac52 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A__NonAbstract_NonIndexed.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy3_A__NonAbstract_NonIndexed.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity(name = Hierarchy3_A__NonAbstract_NonIndexed.NAME) public class Hierarchy3_A__NonAbstract_NonIndexed { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_B__integer1DocumentId.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_B__integer1DocumentId.java index 922e1c11273..b0ad819692f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_B__integer1DocumentId.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_B__integer1DocumentId.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_C__integer2DocumentId.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_C__integer2DocumentId.java index f335dd6f6f6..6ee6bf76997 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_C__integer2DocumentId.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_C__integer2DocumentId.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_D.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_D.java index f61f3c1fcb6..4a4a8e8d457 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_D.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A_D.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A__NonAbstract_NonIndexed.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A__NonAbstract_NonIndexed.java index 124eb2d7fc1..b4c3d76b8d2 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A__NonAbstract_NonIndexed.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy4_A__NonAbstract_NonIndexed.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity(name = Hierarchy4_A__NonAbstract_NonIndexed.NAME) public class Hierarchy4_A__NonAbstract_NonIndexed { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B_C.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B_C.java index 3ed87b6b414..a1f8490b890 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B_C.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B_C.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B_D.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B_D.java index 6cebbbba093..8226cab3dbe 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B_D.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B_D.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B__MappedSuperClass.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B__MappedSuperClass.java index cbfd53f75cc..5677ee545ff 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B__MappedSuperClass.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A_B__MappedSuperClass.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class Hierarchy5_A_B__MappedSuperClass extends Hierarchy5_A__Abstract { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A__Abstract.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A__Abstract.java index 0c87bf276fc..8c157a2ce94 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A__Abstract.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy5_A__Abstract.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity(name = Hierarchy5_A__Abstract.NAME) public abstract class Hierarchy5_A__Abstract { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A_B_Cacheable.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A_B_Cacheable.java index 1ef5f940de1..b7f229cd9b3 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A_B_Cacheable.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A_B_Cacheable.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Cacheable; -import javax.persistence.Entity; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A_C_Cacheable.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A_C_Cacheable.java index b097946f196..a4a19568d7f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A_C_Cacheable.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A_C_Cacheable.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Cacheable; -import javax.persistence.Entity; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A__Abstract.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A__Abstract.java index f38a5e1355f..d26bf9da464 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A__Abstract.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy6_A__Abstract.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity(name = Hierarchy6_A__Abstract.NAME) public abstract class Hierarchy6_A__Abstract { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_B.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_B.java index a85d8ab4503..62479d4b03c 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_B.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_B.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_C.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_C.java index cca99e3edb2..28ed003edf4 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_C.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_C.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_D.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_D.java index e3849844412..180c5e767db 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_D.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A_D.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A__Abstract.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A__Abstract.java index a81a08ec5cb..0755dde3ba6 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A__Abstract.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy7_A__Abstract.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity(name = Hierarchy7_A__Abstract.NAME) public abstract class Hierarchy7_A__Abstract { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_B_Cacheable.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_B_Cacheable.java index d9951606bd6..b921811a17b 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_B_Cacheable.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_B_Cacheable.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Cacheable; -import javax.persistence.Entity; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_C_Cacheable.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_C_Cacheable.java index 8e115b17af4..db3ed1e314d 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_C_Cacheable.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_C_Cacheable.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Cacheable; -import javax.persistence.Entity; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_D_Cacheable.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_D_Cacheable.java index 92a7160f06c..1f883dd20b6 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_D_Cacheable.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A_D_Cacheable.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Cacheable; -import javax.persistence.Entity; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A__Abstract.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A__Abstract.java index 8136d402504..fdf96efcc45 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A__Abstract.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/multipletypes/Hierarchy8_A__Abstract.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.multipletypes; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity(name = Hierarchy8_A__Abstract.NAME) public abstract class Hierarchy8_A__Abstract { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/BasicContainedEntity.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/BasicContainedEntity.java index b00ac0bcf2b..aa11b6024d5 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/BasicContainedEntity.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/BasicContainedEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.singletype; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; @Entity(name = BasicContainedEntity.NAME) public class BasicContainedEntity { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/BasicIndexedEntity.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/BasicIndexedEntity.java index 8ce0a472ec1..80e7bc640ab 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/BasicIndexedEntity.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/BasicIndexedEntity.java @@ -8,13 +8,13 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.NamedEntityGraph; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; @Entity(name = BasicIndexedEntity.NAME) @NamedEntityGraph( diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/FetchSubSelectContainedEntity.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/FetchSubSelectContainedEntity.java index 2ff92bb85b1..fa1ffde2282 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/FetchSubSelectContainedEntity.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/FetchSubSelectContainedEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.integrationtest.mapper.orm.search.loading.model.singletype; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; @Entity(name = FetchSubSelectContainedEntity.NAME) public class FetchSubSelectContainedEntity { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/FetchSubSelectIndexedEntity.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/FetchSubSelectIndexedEntity.java index 44e0f806092..b01e3d099cc 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/FetchSubSelectIndexedEntity.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/model/singletype/FetchSubSelectIndexedEntity.java @@ -8,13 +8,13 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.NamedEntityGraph; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanBaseIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanBaseIT.java index dc885429cec..1abc5e427f0 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanBaseIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanBaseIT.java @@ -12,10 +12,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Session; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanNonEntityIdDocumentIdIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanNonEntityIdDocumentIdIT.java index 57de7d3f083..1502c88d677 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanNonEntityIdDocumentIdIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanNonEntityIdDocumentIdIT.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.session; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanPersistBatchIndexingIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanPersistBatchIndexingIT.java index d6596fead85..66c66c03324 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanPersistBatchIndexingIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/session/SearchIndexingPlanPersistBatchIndexingIT.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.integrationtest.mapper.orm.session; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.work.SearchIndexingPlan; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/AnnotationMappingSmokeIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/AnnotationMappingSmokeIT.java index fe7c85ce873..61a14a9ecdc 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/AnnotationMappingSmokeIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/AnnotationMappingSmokeIT.java @@ -16,15 +16,15 @@ import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; import org.hibernate.search.integrationtest.mapper.orm.smoke.bridge.CustomPropertyBinding; import org.hibernate.search.integrationtest.mapper.orm.smoke.bridge.CustomTypeBinding; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/ProgrammaticMappingSmokeIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/ProgrammaticMappingSmokeIT.java index fcc81d6c18c..fadc43f8249 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/ProgrammaticMappingSmokeIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/ProgrammaticMappingSmokeIT.java @@ -15,15 +15,15 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; import org.hibernate.search.engine.search.query.SearchQuery; import org.hibernate.search.integrationtest.mapper.orm.smoke.bridge.CustomPropertyBridge; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/spi/DifferentSessionFactoriesIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/spi/DifferentSessionFactoriesIT.java index f126422bb10..66b84e0429f 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/spi/DifferentSessionFactoriesIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/spi/DifferentSessionFactoriesIT.java @@ -9,9 +9,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/workspace/AbstractSearchWorkspaceSimpleOperationIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/workspace/AbstractSearchWorkspaceSimpleOperationIT.java index 41408a85da6..00fc737c683 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/workspace/AbstractSearchWorkspaceSimpleOperationIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/workspace/AbstractSearchWorkspaceSimpleOperationIT.java @@ -13,8 +13,8 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/mapper/orm/src/test/java17/org/hibernate/search/integrationtest/mapper/orm/model/IndexedEmbeddedRecordIT.java b/integrationtest/mapper/orm/src/test/java17/org/hibernate/search/integrationtest/mapper/orm/model/IndexedEmbeddedRecordIT.java index c9b9b43797a..e61f778c34f 100644 --- a/integrationtest/mapper/orm/src/test/java17/org/hibernate/search/integrationtest/mapper/orm/model/IndexedEmbeddedRecordIT.java +++ b/integrationtest/mapper/orm/src/test/java17/org/hibernate/search/integrationtest/mapper/orm/model/IndexedEmbeddedRecordIT.java @@ -9,11 +9,11 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.annotations.Immutable; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/attributeconverter/ISBNAttributeConverter.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/attributeconverter/ISBNAttributeConverter.java index a7240da9143..1ce3d447db1 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/attributeconverter/ISBNAttributeConverter.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/attributeconverter/ISBNAttributeConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.showcase.library.attributeconverter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.search.integrationtest.showcase.library.model.ISBN; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/AbstractEntity.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/AbstractEntity.java index 812ae96d370..9f197b9afe4 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/AbstractEntity.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/AbstractEntity.java @@ -7,7 +7,7 @@ package org.hibernate.search.integrationtest.showcase.library.model; import java.util.Objects; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.Hibernate; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Account.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Account.java index bc1f4f48ac0..0b7c2ba025f 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Account.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Account.java @@ -8,12 +8,12 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; import org.hibernate.search.integrationtest.showcase.library.bridge.AccountBorrowalSummaryBridge; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.TypeBinderRef; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Book.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Book.java index dc80685cc6b..9adda6146c0 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Book.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.integrationtest.showcase.library.model; -import javax.persistence.Basic; -import javax.persistence.Convert; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; import org.hibernate.search.integrationtest.showcase.library.attributeconverter.ISBNAttributeConverter; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBinderRef; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/BookCopy.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/BookCopy.java index 0bfdc61401a..022d98580b3 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/BookCopy.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/BookCopy.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.showcase.library.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Borrowal.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Borrowal.java index 3ddefd86a04..1b029cc1ad6 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Borrowal.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Borrowal.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.integrationtest.showcase.library.model; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Borrowal extends AbstractEntity { diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Document.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Document.java index 6e8d3bb7661..e8207b9ad3b 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Document.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Document.java @@ -8,12 +8,12 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.engine.backend.types.Projectable; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/DocumentCopy.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/DocumentCopy.java index 6c16825cd2e..125d0ebb2c8 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/DocumentCopy.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/DocumentCopy.java @@ -8,14 +8,14 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Library.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Library.java index 9b2f0392619..23d0416b1e0 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Library.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Library.java @@ -9,12 +9,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.engine.backend.types.Aggregable; import org.hibernate.search.engine.backend.types.Projectable; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Person.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Person.java index 087bc984508..ef5a073bae3 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Person.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Person.java @@ -7,10 +7,10 @@ package org.hibernate.search.integrationtest.showcase.library.model; import java.util.StringJoiner; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.engine.backend.types.Sortable; import org.hibernate.search.integrationtest.showcase.library.analysis.LibraryAnalyzers; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Video.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Video.java index 849d29a4d7a..4bdbe431edf 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Video.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Video.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.showcase.library.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * A video document. diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/VideoCopy.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/VideoCopy.java index 26edfe309e2..4fbd7cf8e3e 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/VideoCopy.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/VideoCopy.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.showcase.library.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchDocumentRepositoryImpl.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchDocumentRepositoryImpl.java index c6adae6d9d1..2e80423d0a5 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchDocumentRepositoryImpl.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchDocumentRepositoryImpl.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Optional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.search.engine.search.sort.dsl.SortOrder; import org.hibernate.search.engine.search.common.ValueConvert; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchLibraryRepositoryImpl.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchLibraryRepositoryImpl.java index e9491cfc590..5f264d24318 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchLibraryRepositoryImpl.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchLibraryRepositoryImpl.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.search.engine.search.aggregation.AggregationKey; import org.hibernate.search.engine.search.query.SearchResult; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchPersonRepositoryImpl.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchPersonRepositoryImpl.java index 6b58ec9f6d7..0794cc2e413 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchPersonRepositoryImpl.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchPersonRepositoryImpl.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.search.integrationtest.showcase.library.model.Person; import org.hibernate.search.mapper.orm.Search; diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/service/AdminService.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/service/AdminService.java index 75e30cb3678..53a7252152f 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/service/AdminService.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/service/AdminService.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.showcase.library.service; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.massindexing.MassIndexer; diff --git a/integrationtest/showcase/library/src/main/java17/org/hibernate/search/integrationtest/showcase/library/service/Java17Service.java b/integrationtest/showcase/library/src/main/java17/org/hibernate/search/integrationtest/showcase/library/service/Java17Service.java index b5d36cabb02..1bafcc281ff 100644 --- a/integrationtest/showcase/library/src/main/java17/org/hibernate/search/integrationtest/showcase/library/service/Java17Service.java +++ b/integrationtest/showcase/library/src/main/java17/org/hibernate/search/integrationtest/showcase/library/service/Java17Service.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.search.integrationtest.showcase.library.dto.LibrarySimpleProjectionRecord; import org.hibernate.search.integrationtest.showcase.library.model.Library; diff --git a/integrationtest/showcase/library/src/test/java/org/hibernate/search/integrationtest/showcase/library/service/TestDataService.java b/integrationtest/showcase/library/src/test/java/org/hibernate/search/integrationtest/showcase/library/service/TestDataService.java index ea34766ab33..7350ab31164 100644 --- a/integrationtest/showcase/library/src/test/java/org/hibernate/search/integrationtest/showcase/library/service/TestDataService.java +++ b/integrationtest/showcase/library/src/test/java/org/hibernate/search/integrationtest/showcase/library/service/TestDataService.java @@ -8,8 +8,8 @@ import java.util.Locale; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.search.integrationtest.showcase.library.model.Book; import org.hibernate.search.integrationtest.showcase.library.model.BookMedium; diff --git a/integrationtest/v5migrationhelper/orm/pom.xml b/integrationtest/v5migrationhelper/orm/pom.xml index d134d8036ac..daac67e4e5f 100755 --- a/integrationtest/v5migrationhelper/orm/pom.xml +++ b/integrationtest/v5migrationhelper/orm/pom.xml @@ -47,12 +47,12 @@ org.hibernate - hibernate-envers + hibernate-envers-jakarta test org.hibernate - hibernate-testing + hibernate-testing-jakarta test diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/NotPackagedEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/NotPackagedEntity.java index 320b9f0502d..6e86eb26a70 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/NotPackagedEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/NotPackagedEntity.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.GeneratedValue; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/Document.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/Document.java index 022a81ccde4..36ba426e82f 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/Document.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/Document.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/backend/Clock.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/backend/Clock.java index 55117193fe2..9d03afb4583 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/backend/Clock.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/backend/Clock.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.backend; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/AncientBook.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/AncientBook.java index bc47eb914c5..cec219201ad 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/AncientBook.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/AncientBook.java @@ -9,9 +9,9 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Book.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Book.java index 35430f5726a..e92aa1d5b28 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Book.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Book.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Clock.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Clock.java index 646a8b66309..9721e2c8f36 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Clock.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Clock.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/ConcurrentData.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/ConcurrentData.java index 993bd3b6877..63b1b120d7c 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/ConcurrentData.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/ConcurrentData.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Dvd.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Dvd.java index c841df71b75..2fedf9c7906 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Dvd.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Dvd.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/ExtendedIssueEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/ExtendedIssueEntity.java index c73caa63dc0..3e4da548cf2 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/ExtendedIssueEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/ExtendedIssueEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyLazyEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyLazyEntity.java index c7196f25c04..c2c6d05a45d 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyLazyEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyLazyEntity.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.batchindexing; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyRootEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyRootEntity.java index fcac4752b7b..fe6deaf8db6 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyRootEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyRootEntity.java @@ -7,11 +7,11 @@ package org.hibernate.search.test.batchindexing; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IssueEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IssueEntity.java index 1c00129e9db..22b9fe55255 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IssueEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/IssueEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCar.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCar.java index 2354062279c..b098d102dac 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCar.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCar.java @@ -13,12 +13,12 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Bayo Erinle diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCarPlant.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCarPlant.java index a671302df55..66edf28e8de 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCarPlant.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCarPlant.java @@ -6,12 +6,12 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyTire.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyTire.java index 0c038b7f9d3..f83429613d8 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyTire.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyTire.java @@ -6,13 +6,13 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Nation.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Nation.java index dcb1729acdf..83ed1ef3dcb 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Nation.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Nation.java @@ -8,11 +8,11 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/SecretBook.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/SecretBook.java index 1c749dd08d6..9abca4c6c4a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/SecretBook.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/SecretBook.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/WeirdlyIdentifiedEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/WeirdlyIdentifiedEntity.java index 1b5c2e3d17d..31c46c4ff23 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/WeirdlyIdentifiedEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/WeirdlyIdentifiedEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.batchindexing; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/ArrayBridgeTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/ArrayBridgeTest.java index 21cb4b8050a..282d060d217 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/ArrayBridgeTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/ArrayBridgeTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNotNull; /** - * Test indexing of {@link javax.persistence.ElementCollection} annotated arrays. + * Test indexing of {@link jakarta.persistence.ElementCollection} annotated arrays. * * @author Davide D'Alto */ diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/ArrayBridgeTestEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/ArrayBridgeTestEntity.java index bbd99243101..0fb64a58072 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/ArrayBridgeTestEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/ArrayBridgeTestEntity.java @@ -8,15 +8,15 @@ import java.util.Date; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DateBridge; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/Cloud.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/Cloud.java index df65b11dbfc..484c96637f8 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/Cloud.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/Cloud.java @@ -12,9 +12,9 @@ import java.util.Date; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.CalendarBridge; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/Gangster.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/Gangster.java index 5f7ad04ae7d..5a05e9614a1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/Gangster.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/Gangster.java @@ -8,8 +8,8 @@ import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/IterableBridgeTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/IterableBridgeTest.java index e8c71f80520..7d64a8dc349 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/IterableBridgeTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/IterableBridgeTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNotNull; /** - * Test indexing of {@link javax.persistence.ElementCollection} annotated iterables. + * Test indexing of {@link jakarta.persistence.ElementCollection} annotated iterables. * * @author Davide D'Alto */ diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/IterableBridgeTestEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/IterableBridgeTestEntity.java index f8ae3130a74..e079ff818d0 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/IterableBridgeTestEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/IterableBridgeTestEntity.java @@ -12,14 +12,14 @@ import java.util.List; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DateBridge; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/MapBridgeTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/MapBridgeTest.java index 3fcc7361c2c..f887b8b6cda 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/MapBridgeTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/MapBridgeTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNotNull; /** - * Test indexing of {@link javax.persistence.ElementCollection} annotated maps. + * Test indexing of {@link jakarta.persistence.ElementCollection} annotated maps. * * @author Davide D'Alto */ diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/MapBridgeTestEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/MapBridgeTestEntity.java index cf33c782ee8..9a46f4206a9 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/MapBridgeTestEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/MapBridgeTestEntity.java @@ -9,15 +9,15 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DateBridge; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/ClassLevelTestPoI.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/ClassLevelTestPoI.java index cff8de6edec..8a03598d667 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/ClassLevelTestPoI.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/ClassLevelTestPoI.java @@ -7,9 +7,9 @@ package org.hibernate.search.test.configuration; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.spatial.Coordinates; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/Departments.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/Departments.java index 0881cdee309..deefc0ce66c 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/Departments.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/Departments.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.configuration; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * This is just a simple copy of the Department entity to allow diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/DynamicBoostedDescLibrary.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/DynamicBoostedDescLibrary.java index 811a565776a..11883d3ba91 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/DynamicBoostedDescLibrary.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/DynamicBoostedDescLibrary.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.configuration; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Test entity using a custom CustomBoostStrategy to set diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/LatLongAnnTestPoi.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/LatLongAnnTestPoi.java index 37e5c910e76..b9f1f1f1ff4 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/LatLongAnnTestPoi.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/LatLongAnnTestPoi.java @@ -7,9 +7,9 @@ package org.hibernate.search.test.configuration; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class LatLongAnnTestPoi { diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/LobTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/LobTest.java index 5fbc086d772..fc90c711059 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/LobTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/LobTest.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.configuration; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.apache.lucene.search.Query; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/MemberLevelTestPoI.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/MemberLevelTestPoI.java index 561d7888c4a..c05bb5becf5 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/MemberLevelTestPoI.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/MemberLevelTestPoI.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.configuration; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.ObjectPath; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/ProvidedIdEntry.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/ProvidedIdEntry.java index ef3cc160b35..5db8552f0b6 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/ProvidedIdEntry.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/ProvidedIdEntry.java @@ -8,9 +8,9 @@ import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ProvidedIdEntry implements Serializable { diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/field/TokenizationTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/field/TokenizationTest.java index 397e544598e..a4777b29053 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/field/TokenizationTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/field/TokenizationTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.configuration.field; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/indexingStrategy/ManualIndexingStrategyTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/indexingStrategy/ManualIndexingStrategyTest.java index 8581c062cf5..054b681f05d 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/indexingStrategy/ManualIndexingStrategyTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/configuration/indexingStrategy/ManualIndexingStrategyTest.java @@ -9,10 +9,10 @@ import static org.junit.Assert.assertEquals; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/AbstractProduct.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/AbstractProduct.java index 892beab6137..d4c90a542a1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/AbstractProduct.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/AbstractProduct.java @@ -8,11 +8,11 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Address.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Address.java index 4f11c6fdde3..1a884a0c5db 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Address.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Address.java @@ -8,13 +8,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Target; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Author.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Author.java index 1b0f101fcdc..6de95087aaa 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Author.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.GeneratedValue; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Book.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Book.java index a2a1fc78d21..99f4d63b262 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Book.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Book.java @@ -7,7 +7,7 @@ package org.hibernate.search.test.embedded; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/ContainedInEntityInheritanceTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/ContainedInEntityInheritanceTest.java index aaa411e896a..a372419e1e9 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/ContainedInEntityInheritanceTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/ContainedInEntityInheritanceTest.java @@ -8,11 +8,11 @@ import static org.junit.Assert.assertEquals; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; import org.apache.lucene.search.Query; import org.hibernate.Session; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Country.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Country.java index 97cdc312e84..a6b5e148c15 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Country.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Country.java @@ -8,12 +8,12 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.IndexColumn; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java index 695b35fb3da..025d1975948 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.GeneratedValue; /** * @author Emmanuel Bernard diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Order.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Order.java index 0355cd4c23e..a36dc4b1837 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Order.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Order.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Owner.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Owner.java index 705af03415e..ee2d62f5b9e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Owner.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Owner.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Product.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Product.java index fcc259d752c..761075a7404 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Product.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Product.java @@ -10,12 +10,12 @@ import java.util.Map; import java.util.HashSet; import java.util.HashMap; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.CascadeType; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.Id; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.MapKeyColumn; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/ProductFeature.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/ProductFeature.java index 12317d8a1da..39b31b00261 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/ProductFeature.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/ProductFeature.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Resident.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Resident.java index 2a8d94293c4..528aeef0525 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Resident.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Resident.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/State.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/State.java index f13f9349e66..56dabad9c83 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/State.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/State.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.embedded; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/StateCandidate.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/StateCandidate.java index 17187f68974..b67fa2be65a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/StateCandidate.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/StateCandidate.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.embedded; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Tower.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Tower.java index 86c53a184de..46441c4c24b 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Tower.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Tower.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.embedded; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Address.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Address.java index 08c1561f38a..571e312e6d1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Address.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Address.java @@ -8,14 +8,14 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/BusinessContact.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/BusinessContact.java index 471a8c30d1f..c113361c75c 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/BusinessContact.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/BusinessContact.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.embedded.doubleinsert; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Contact.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Contact.java index 724bfdfc506..171215f8831 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Contact.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Contact.java @@ -10,19 +10,19 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; @@ -36,7 +36,7 @@ @Table(name = "T_CONTACT") @Inheritance(strategy = InheritanceType.SINGLE_TABLE) @DiscriminatorValue("Contact") -@DiscriminatorColumn(name = "contactType", discriminatorType = javax.persistence.DiscriminatorType.STRING) +@DiscriminatorColumn(name = "contactType", discriminatorType = jakarta.persistence.DiscriminatorType.STRING) @Indexed public class Contact implements Serializable { diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/PersonalContact.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/PersonalContact.java index 6c838d9f864..8ccee13c37f 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/PersonalContact.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/PersonalContact.java @@ -7,9 +7,9 @@ package org.hibernate.search.test.embedded.doubleinsert; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Phone.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Phone.java index 15c4f2d0596..704957e277a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Phone.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Phone.java @@ -8,14 +8,14 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/fieldoncollection/IndexedEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/fieldoncollection/IndexedEntity.java index e0600fb6493..6f95dd40851 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/fieldoncollection/IndexedEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/fieldoncollection/IndexedEntity.java @@ -9,13 +9,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/Event.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/Event.java index 30390bb0121..5c5f350a1d1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/Event.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/Event.java @@ -10,10 +10,10 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/ParentOfBirthEvent.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/ParentOfBirthEvent.java index 5712ae51766..479908391d2 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/ParentOfBirthEvent.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/ParentOfBirthEvent.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.embedded.graph; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/Person.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/Person.java index 1eba82608cc..887d70a47e7 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/Person.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/graph/Person.java @@ -10,12 +10,12 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Address.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Address.java index 3b9f0cc6d57..5ff3ceefed0 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Address.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Address.java @@ -8,10 +8,10 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Attribute.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Attribute.java index 0e05e395a9f..c379b64f808 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Attribute.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Attribute.java @@ -8,13 +8,13 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/AttributeValue.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/AttributeValue.java index 8ef2e261e9f..43288cf3f6e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/AttributeValue.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/AttributeValue.java @@ -6,12 +6,12 @@ */ package org.hibernate.search.test.embedded.nested; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Store; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Person.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Person.java index 4a1af4044b4..04d41c3e97e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Person.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Person.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Place.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Place.java index dfba8836bd5..951647a5559 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Place.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Place.java @@ -8,12 +8,12 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Product.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Product.java index e1b35cf1a61..9a947dc4d6f 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Product.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/Product.java @@ -8,12 +8,12 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java index 43d28eeaea8..111817641b1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java @@ -8,10 +8,10 @@ package org.hibernate.search.test.embedded.nested.containedIn; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.search.annotations.Field; @@ -20,10 +20,10 @@ * * @author grolland */ -@javax.persistence.Entity +@jakarta.persistence.Entity @org.hibernate.annotations.Proxy(lazy = true) @org.hibernate.search.annotations.Indexed -@javax.persistence.Table(name = "entity1") +@jakarta.persistence.Table(name = "entity1") //@SequenceGenerator( name="ids_generator1", sequenceName = "ids_generator1") public class Entity1ForDoc0 implements Serializable { @@ -38,7 +38,7 @@ public class Entity1ForDoc0 implements Serializable { @Version private int optlock; - @javax.persistence.OneToMany(mappedBy = "entity1", cascade = { }) + @jakarta.persistence.OneToMany(mappedBy = "entity1", cascade = { }) @org.hibernate.search.annotations.IndexedEmbedded(includeEmbeddedObjectId = true) private java.util.List entities2 = new java.util.ArrayList(); diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForUnindexed.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForUnindexed.java index 0077f57e704..23ebd75bd8e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForUnindexed.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForUnindexed.java @@ -8,10 +8,10 @@ package org.hibernate.search.test.embedded.nested.containedIn; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.search.annotations.Field; @@ -20,10 +20,10 @@ * * @author grolland */ -@javax.persistence.Entity +@jakarta.persistence.Entity @org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.READ_WRITE) -@javax.persistence.Table(name = "entity1") +@jakarta.persistence.Table(name = "entity1") public class Entity1ForUnindexed implements Serializable { private static final long serialVersionUID = -3191273589083411349L; @@ -37,7 +37,7 @@ public class Entity1ForUnindexed implements Serializable { @Version private int optlock; - @javax.persistence.OneToMany(mappedBy = "entity1", cascade = { }) + @jakarta.persistence.OneToMany(mappedBy = "entity1", cascade = { }) @org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.READ_WRITE) private java.util.List entities2 = new java.util.ArrayList(); diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForDoc0.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForDoc0.java index 5af899b847b..a531ea35a8a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForDoc0.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForDoc0.java @@ -7,18 +7,18 @@ package org.hibernate.search.test.embedded.nested.containedIn; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * @author grolland */ -@javax.persistence.Entity +@jakarta.persistence.Entity @org.hibernate.annotations.Proxy(lazy = true) -@javax.persistence.Table(name = "entity2") +@jakarta.persistence.Table(name = "entity2") public class Entity2ForDoc0 { @Id @@ -29,7 +29,7 @@ public class Entity2ForDoc0 { @Version private int optlock; - @javax.persistence.ManyToOne(cascade = { }, fetch = javax.persistence.FetchType.LAZY) + @jakarta.persistence.ManyToOne(cascade = { }, fetch = jakarta.persistence.FetchType.LAZY) private Entity1ForDoc0 entity1; @Basic diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForUnindexed.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForUnindexed.java index 84ded1a1920..2b51efb8ea1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForUnindexed.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity2ForUnindexed.java @@ -7,20 +7,20 @@ package org.hibernate.search.test.embedded.nested.containedIn; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * Entite 2 * * @author grolland */ -@javax.persistence.Entity +@jakarta.persistence.Entity @org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.READ_WRITE) -@javax.persistence.Table(name = "entity2") +@jakarta.persistence.Table(name = "entity2") @org.hibernate.search.annotations.Indexed public class Entity2ForUnindexed { @@ -38,7 +38,7 @@ public class Entity2ForUnindexed { @Version private int optlock; - @javax.persistence.ManyToOne(cascade = { }, fetch = javax.persistence.FetchType.LAZY) + @jakarta.persistence.ManyToOne(cascade = { }, fetch = jakarta.persistence.FetchType.LAZY) @org.hibernate.search.annotations.IndexedEmbedded() @org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.READ_WRITE) private Entity1ForUnindexed entity1; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/HelpItem.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/HelpItem.java index 0976d2d44fe..b845929776b 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/HelpItem.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/HelpItem.java @@ -9,13 +9,13 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/HelpItemTag.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/HelpItemTag.java index 22cb8f3829e..050372a7926 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/HelpItemTag.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/HelpItemTag.java @@ -7,14 +7,14 @@ package org.hibernate.search.test.embedded.nested.containedIn; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Tag.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Tag.java index e2d4fe67199..7d4a7ad252b 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Tag.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Tag.java @@ -10,14 +10,14 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/Human.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/Human.java index 76ac68e9885..ee701d619b2 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/Human.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/Human.java @@ -10,12 +10,12 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityA.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityA.java index deba6e87ab3..d7644e26075 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityA.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityA.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.defaultdepth; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityB.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityB.java index 32e8ded9bf7..e4873fb328b 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityB.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityB.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.defaultdepth; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.AssociationInverseSide; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityC.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityC.java index 32c808dd65f..ab78a8c6b74 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityC.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/defaultdepth/EntityC.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.defaultdepth; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityA.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityA.java index 6518c6c3332..dbc0ccfe7fe 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityA.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityA.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.depth; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityB.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityB.java index a86d12a805a..994d07b6432 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityB.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityB.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.depth; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityC.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityC.java index 39c18ebdced..e366a65e457 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityC.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/EntityC.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.depth; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityA.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityA.java index 73bbe5cd887..f2c430905d0 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityA.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityA.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.multiple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityB.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityB.java index 0c7eb5557e4..db621683388 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityB.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityB.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.multiple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.AssociationInverseSide; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityC.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityC.java index ab49bc5e1a8..843b59fb96e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityC.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/multiple/EntityC.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.multiple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Fields; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityA.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityA.java index eed55138ebd..a510f91b066 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityA.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityA.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.prefixed; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityB.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityB.java index 642a090fdd1..f1836cefa7e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityB.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityB.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.prefixed; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.AssociationInverseSide; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityC.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityC.java index 1246d52201b..8ad81a282d8 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityC.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/prefixed/EntityC.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.prefixed; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityA.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityA.java index 230365b9086..4fa1332e0b0 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityA.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityA.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.renamed; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityB.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityB.java index d97d6d303b7..34d5e9033de 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityB.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityB.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.renamed; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.AssociationInverseSide; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityC.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityC.java index 75ee8863627..b29a417a84b 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityC.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/renamed/EntityC.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.renamed; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityA.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityA.java index 9730230fa85..fc9a14ca034 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityA.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityA.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.simple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityB.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityB.java index 9e394a887b7..1fbb1bc7ec3 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityB.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityB.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.simple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.AssociationInverseSide; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityC.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityC.java index 2dc537601f2..61c254b0541 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityC.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/simple/EntityC.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.simple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/A.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/A.java index 7899d676df8..29162dfc856 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/A.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/A.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/B.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/B.java index 5b748bb2c5a..92059d5e139 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/B.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/B.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/C.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/C.java index e00b4bfd4fc..d9b87bed36b 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/C.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/C.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DeepPathSimpleTypeCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DeepPathSimpleTypeCase.java index 16f12abf4c8..d2ef942de97 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DeepPathSimpleTypeCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DeepPathSimpleTypeCase.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DeepPathWithLeadingPrefixCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DeepPathWithLeadingPrefixCase.java index 4c5c3f24329..491b3babc9a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DeepPathWithLeadingPrefixCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DeepPathWithLeadingPrefixCase.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DepthExceedsPathTestCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DepthExceedsPathTestCase.java index 4086381179d..862fccaa9ce 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DepthExceedsPathTestCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DepthExceedsPathTestCase.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DepthMatchesPathDepthCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DepthMatchesPathDepthCase.java index 799e9266430..f6aed876c38 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DepthMatchesPathDepthCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/DepthMatchesPathDepthCase.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/Embedded.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/Embedded.java index ffb1c1f5598..a05ce6d1f23 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/Embedded.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/Embedded.java @@ -9,8 +9,8 @@ import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToMany; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.IndexedEmbedded; @@ -21,7 +21,7 @@ public class Embedded { @Field public String e1; - @javax.persistence.ElementCollection + @jakarta.persistence.ElementCollection public Set e2; @IndexedEmbedded diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/FieldRenamedContainerEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/FieldRenamedContainerEntity.java index a022525ac5d..6aef93b47e1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/FieldRenamedContainerEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/FieldRenamedContainerEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/FieldRenamedEmbeddedEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/FieldRenamedEmbeddedEntity.java index 78227da33f0..6381786820d 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/FieldRenamedEmbeddedEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/FieldRenamedEmbeddedEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.AssociationInverseSide; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedNonLeafCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedNonLeafCase.java index f6a93c487a1..3de6ef61b9c 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedNonLeafCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedNonLeafCase.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedPathCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedPathCase.java index ddf34b25ccb..28ce977a6dd 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedPathCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedPathCase.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedWithoutPathsCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedWithoutPathsCase.java index dc4ab6c21b6..4788d1d1973 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedWithoutPathsCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidEmbeddedWithoutPathsCase.java @@ -7,9 +7,9 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidPrefixCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidPrefixCase.java index 5899e96837d..24a8ca6b50d 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidPrefixCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidPrefixCase.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidShallowPathCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidShallowPathCase.java index 7fe32628eb6..c4d18f406bb 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidShallowPathCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/InvalidShallowPathCase.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/PathNotIndexedCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/PathNotIndexedCase.java index 25e98495971..cbeb2227a64 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/PathNotIndexedCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/PathNotIndexedCase.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/ReferencesC.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/ReferencesC.java index b2d634eb80e..0306ce9edc0 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/ReferencesC.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/ReferencesC.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/ReferencesIndexedEmbeddedA.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/ReferencesIndexedEmbeddedA.java index 9d17fbbc092..3cf6a60a95c 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/ReferencesIndexedEmbeddedA.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/validation/ReferencesIndexedEmbeddedA.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.embedded.path.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/PolymorphicAssociationContainedInTargetTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/PolymorphicAssociationContainedInTargetTest.java index f0e49f2587e..ac504b5c6f3 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/PolymorphicAssociationContainedInTargetTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/PolymorphicAssociationContainedInTargetTest.java @@ -8,10 +8,10 @@ import static org.junit.Assert.assertEquals; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/PolymorphicAssociationPropertyAccessTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/PolymorphicAssociationPropertyAccessTest.java index 6d756adc047..8846969234c 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/PolymorphicAssociationPropertyAccessTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/PolymorphicAssociationPropertyAccessTest.java @@ -8,11 +8,11 @@ import static org.junit.Assert.assertEquals; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/AbstractEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/AbstractEntity.java index f8eb2ff23b8..4ea56481ab2 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/AbstractEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/AbstractEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.embedded.polymorphism.uninitializedproxy; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/ConcreteEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/ConcreteEntity.java index 5a31cf85b08..fee7ccf3732 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/ConcreteEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/ConcreteEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.embedded.polymorphism.uninitializedproxy; -import javax.persistence.Cacheable; -import javax.persistence.Entity; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/LazyAbstractEntityReference.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/LazyAbstractEntityReference.java index add0c46cdc6..bda9e7ef173 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/LazyAbstractEntityReference.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/polymorphism/uninitializedproxy/LazyAbstractEntityReference.java @@ -6,12 +6,12 @@ */ package org.hibernate.search.test.embedded.polymorphism.uninitializedproxy; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/sorting/Hero.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/sorting/Hero.java index 4bd49cd60a6..513589becaf 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/sorting/Hero.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/sorting/Hero.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.embedded.sorting; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/sorting/Villain.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/sorting/Villain.java index fcb6d418779..3d5db3b4367 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/sorting/Villain.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/sorting/Villain.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.embedded.sorting; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Dad.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Dad.java index 7ff90519701..ea866230635 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Dad.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Dad.java @@ -8,12 +8,12 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Store; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Grandpa.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Grandpa.java index c1e583ea083..27eba10c89b 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Grandpa.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Grandpa.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.embedded.update; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductArticle.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductArticle.java index 37a1c556233..873dd7e2cc4 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductArticle.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductArticle.java @@ -10,12 +10,12 @@ import java.util.Collection; import java.util.Collections; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Transient; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductModel.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductModel.java index 2882c7cb0ca..f30accaa654 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductModel.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductModel.java @@ -13,14 +13,14 @@ import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductReferenceCode.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductReferenceCode.java index ff37ae96659..b3f7d5ac9f4 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductReferenceCode.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductReferenceCode.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.embedded.update; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class ProductReferenceCode { diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductShootingBrief.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductShootingBrief.java index aea8a6a88c5..af01e27a851 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductShootingBrief.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/ProductShootingBrief.java @@ -12,12 +12,12 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; import org.hibernate.search.annotations.Analyzer; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/SimpleChildEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/SimpleChildEntity.java index 2093c435fc2..a9f38ec75ec 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/SimpleChildEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/SimpleChildEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.embedded.update; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/SimpleParentEntity.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/SimpleParentEntity.java index 2981f364680..8b3b620dadb 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/SimpleParentEntity.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/SimpleParentEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.embedded.update; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Son.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Son.java index fefa5c68539..96369dbcd2a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Son.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/Son.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.embedded.update; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/UpdateIndexedEmbeddedCollectionTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/UpdateIndexedEmbeddedCollectionTest.java index 670fa8cbb1a..4f6ca11aade 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/UpdateIndexedEmbeddedCollectionTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/update/UpdateIndexedEmbeddedCollectionTest.java @@ -9,12 +9,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.lucene.index.Term; import org.apache.lucene.search.TermQuery; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/BusLine.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/BusLine.java index 4a6cbf8b9a7..8b8f21a2a19 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/BusLine.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/BusLine.java @@ -8,11 +8,11 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Index; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/BusStop.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/BusStop.java index 4d03b22f5e8..00c12f569ed 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/BusStop.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/BusStop.java @@ -10,12 +10,12 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Transient; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/TransactionSynchronizationTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/TransactionSynchronizationTest.java index 605774c2f73..cdc83cce282 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/TransactionSynchronizationTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/TransactionSynchronizationTest.java @@ -10,11 +10,11 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import org.hibernate.Transaction; import org.hibernate.search.FullTextSession; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/TransientFieldsDirtyTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/TransientFieldsDirtyTest.java index 660445ac201..b87689d3e78 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/TransientFieldsDirtyTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/TransientFieldsDirtyTest.java @@ -9,10 +9,10 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import org.hibernate.Session; import org.hibernate.Transaction; @@ -35,7 +35,7 @@ /** * Verify we don't rely on dirtyness values from Hibernate ORM on fields - * mapped with {@link javax.persistence.Transient}. + * mapped with {@link jakarta.persistence.Transient}. * * @author Sanne Grinovero (C) 2012 Red Hat Inc. */ diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Author.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Author.java index 822cf425040..e8bc08788cb 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Author.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.engine.indexapi; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Book.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Book.java index 5f22561e3ad..9e37090642f 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Book.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Book.java @@ -9,10 +9,10 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DateBridge; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Clock.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Clock.java index 7733ed4f9e7..378764ca169 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Clock.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Clock.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.engine.indexapi; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Leaf.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Leaf.java index 9886a00f0d1..26143db04eb 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Leaf.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Leaf.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.engine.indexapi; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Tree.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Tree.java index 2cbb58bf66b..dbb3558b15a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Tree.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Tree.java @@ -9,11 +9,11 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/worker/Employee.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/worker/Employee.java index 73673b5210a..6e8db39bd94 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/worker/Employee.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/worker/Employee.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.engine.worker; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/worker/Employer.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/worker/Employer.java index 4a9142c70c7..9ae0cfbbd37 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/worker/Employer.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/worker/Employer.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.engine.worker; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/envers/Address.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/envers/Address.java index 7378ec69bd3..6e654240662 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/envers/Address.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/envers/Address.java @@ -7,10 +7,10 @@ package org.hibernate.search.test.envers; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/envers/Person.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/envers/Person.java index 30d7565bec4..afe47b663a7 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/envers/Person.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/envers/Person.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.envers; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.search.annotations.Analyze; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/event/update/CheeseRollingCompetitor.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/event/update/CheeseRollingCompetitor.java index a23f993aa93..cd48defb2b7 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/event/update/CheeseRollingCompetitor.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/event/update/CheeseRollingCompetitor.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.event.update; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/fieldAccess/Document.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/fieldAccess/Document.java index 3b6eefbce2a..5fe28b12e40 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/fieldAccess/Document.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/fieldAccess/Document.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.fieldAccess; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/id/Animal.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/id/Animal.java index ef15650b485..3012024dc29 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/id/Animal.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/id/Animal.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.id; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/id/Article.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/id/Article.java index 19a310fd6d7..b7a3f0d8996 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/id/Article.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/id/Article.java @@ -8,9 +8,9 @@ // $Id:$ package org.hibernate.search.test.id; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Animal.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Animal.java index 7103865b1e3..af9cb93fc87 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Animal.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Animal.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.inheritance; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Being.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Being.java index a96e058be74..ac654614e11 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Being.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Being.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.inheritance; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Bird.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Bird.java index 3f7541f30cb..bd0f57f8450 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Bird.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Bird.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Eagle.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Eagle.java index 475d90ba3c9..e9a1e1e021c 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Eagle.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Eagle.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Fish.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Fish.java index 8915643e3f1..7b7c454e884 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Fish.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Fish.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Mammal.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Mammal.java index 1acb8b1e7c7..e4f56c044e6 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Mammal.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/inheritance/Mammal.java @@ -7,7 +7,7 @@ package org.hibernate.search.test.inheritance; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/Bretzel.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/Bretzel.java index ba0a3309fd3..74b133663dc 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/Bretzel.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/Bretzel.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.jpa; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java index 686eee0c0e7..a7872e6b363 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java @@ -13,8 +13,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.apache.lucene.util.Version; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/ToStringTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/ToStringTest.java index 93e29136e54..4ce17abe093 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/ToStringTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/jpa/ToStringTest.java @@ -8,9 +8,9 @@ import static org.junit.Assert.assertThat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.lucene.search.Query; import org.hamcrest.CoreMatchers; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Author.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Author.java index 4fe8ede668d..02d6ded1f3d 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Author.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Author.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.proxy; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Proxy; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Book.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Book.java index 7e1f51967db..1f68d35cd2d 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Book.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Book.java @@ -8,10 +8,10 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Proxy; import org.hibernate.search.annotations.Analyze; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Comment.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Comment.java index 4f9c0c5a0e8..be5536ea69f 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Comment.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Comment.java @@ -11,14 +11,14 @@ import org.hibernate.annotations.Proxy; import org.hibernate.search.annotations.Field; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Profile.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Profile.java index b3ee673529b..a52a36a4c07 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Profile.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/proxy/Profile.java @@ -11,11 +11,11 @@ import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.Set; @Entity diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/AlternateBook.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/AlternateBook.java index 8f809fbdd0b..63e514266f1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/AlternateBook.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/AlternateBook.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.query; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Author.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Author.java index afd0dbbb6ad..2b44c1b0abb 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Author.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.query; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Book.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Book.java index 321bd99f77d..63623a4b5e9 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Book.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Book.java @@ -10,11 +10,11 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Transient; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DateBridge; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Clock.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Clock.java index 3dcdf8665f4..d3f58a45118 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Clock.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Clock.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.query; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ElectricalProperties.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ElectricalProperties.java index abf92c8f7ee..10a6ea9d36e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ElectricalProperties.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ElectricalProperties.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.query; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Employee.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Employee.java index 12a2deecafe..b58497a2cb5 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Employee.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Employee.java @@ -8,8 +8,8 @@ import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DateBridge; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/FootballTeam.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/FootballTeam.java index 4f8f91803bc..b581f617ef4 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/FootballTeam.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/FootballTeam.java @@ -10,8 +10,8 @@ import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Store; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Gustavo Fernandes diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Husband.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Husband.java index e8fc2ff96c7..1ba7bbd79b4 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Husband.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Husband.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.query; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/LuceneQueryTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/LuceneQueryTest.java index 8552c85f2b4..94e8526ff09 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/LuceneQueryTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/LuceneQueryTest.java @@ -538,7 +538,7 @@ public void testLoadGraphHint() throws Exception { graph.addAttributeNodes( "authors" ); List result = fullTextSession.createFullTextQuery( query, Book.class ) - .setHint( "javax.persistence.loadgraph", graph ) + .setHint( "jakarta.persistence.loadgraph", graph ) .list(); assertNotNull( result ); assertEquals( "Query with explicit entity graph", 1, result.size() ); @@ -562,7 +562,7 @@ public void testFetchGraphHint() throws Exception { graph.addAttributeNodes( "authors" ); List result = fullTextSession.createFullTextQuery( query, Book.class ) - .setHint( "javax.persistence.fetchgraph", graph ) + .setHint( "jakarta.persistence.fetchgraph", graph ) .list(); assertNotNull( result ); assertEquals( "Query with explicit entity graph", 1, result.size() ); diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Music.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Music.java index 8aa12b2d0a2..76aa57918c7 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Music.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Music.java @@ -8,13 +8,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ObjectLoadingPublicFieldTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ObjectLoadingPublicFieldTest.java index b56970b51f5..97d583a8101 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ObjectLoadingPublicFieldTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ObjectLoadingPublicFieldTest.java @@ -11,9 +11,9 @@ import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.lucene.index.Term; import org.apache.lucene.search.MatchAllDocsQuery; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Person.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Person.java index 62980d4e2b8..45ee5e88b08 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Person.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Person.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.query; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ProductArticle.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ProductArticle.java index b18c17b2391..16f18117c38 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ProductArticle.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/ProductArticle.java @@ -8,10 +8,10 @@ import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DateBridge; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Spouse.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Spouse.java index ded689cd757..d4af8f343a7 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Spouse.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Spouse.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.query; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/explain/Dvd.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/explain/Dvd.java index 4cbf26a5f35..50614ef95f6 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/explain/Dvd.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/explain/Dvd.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.query.explain; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.GeneratedValue; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Author.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Author.java index 4aced0ea226..f8c3551765f 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Author.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Author.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.query.facet; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Facet; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Book.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Book.java index 28b85596672..d4a925e13de 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Book.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Book.java @@ -8,10 +8,10 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Car.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Car.java index 9179534425b..de6f2ea5578 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Car.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Car.java @@ -7,9 +7,9 @@ package org.hibernate.search.test.query.facet; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Facet; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Cd.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Cd.java index f5d6bf3aeff..c47308ade21 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Cd.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Cd.java @@ -13,9 +13,9 @@ import java.util.Date; import java.util.Locale; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.DateBridge; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Company.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Company.java index 11a2909b529..5597c4814f3 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Company.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Company.java @@ -9,11 +9,11 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.CascadeType; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/CompanyFacility.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/CompanyFacility.java index 93d1762dfb8..0eb702ad998 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/CompanyFacility.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/CompanyFacility.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.query.facet; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Facet; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Fruit.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Fruit.java index 53b88d80f08..e8b0480f589 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Fruit.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Fruit.java @@ -7,9 +7,9 @@ package org.hibernate.search.test.query.facet; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Facet; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Ingredient.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Ingredient.java index d811a0ac41f..447759ac44b 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Ingredient.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Ingredient.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.query.facet; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Facet; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Recipe.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Recipe.java index 34a414b6f0a..aaa814c3274 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Recipe.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Recipe.java @@ -9,10 +9,10 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Truck.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Truck.java index 0f774f47ae6..64360dad16e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Truck.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Truck.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.query.facet; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Facet; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/initandlookup/Kernel.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/initandlookup/Kernel.java index fd09a26fc93..d89d4e5489f 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/initandlookup/Kernel.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/initandlookup/Kernel.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.query.initandlookup; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/initandlookup/StrictKernel.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/initandlookup/StrictKernel.java index 301721dae90..4d4c7a401e8 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/initandlookup/StrictKernel.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/initandlookup/StrictKernel.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.query.initandlookup; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/nullValues/Value.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/nullValues/Value.java index 3e16f404834..a5ac9584930 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/nullValues/Value.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/nullValues/Value.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.query.nullValues; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/College.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/College.java index c083e468c11..2a062d57e69 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/College.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/College.java @@ -6,12 +6,12 @@ */ package org.hibernate.search.test.query.objectloading.mixedhierarchy; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/CommunityCollege.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/CommunityCollege.java index 27be78782bb..11c1d4d1111 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/CommunityCollege.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/CommunityCollege.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.query.objectloading.mixedhierarchy; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/EducationalInstitution.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/EducationalInstitution.java index 83aae7dc675..c1cd78e5556 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/EducationalInstitution.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/EducationalInstitution.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.query.objectloading.mixedhierarchy; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/HighSchool.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/HighSchool.java index 6bab1be5bea..5860b47858c 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/HighSchool.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/HighSchool.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.query.objectloading.mixedhierarchy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/PrimarySchool.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/PrimarySchool.java index 7d9268007c4..fa82bc28f77 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/PrimarySchool.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/PrimarySchool.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.query.objectloading.mixedhierarchy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/School.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/School.java index 75f27f118b1..958208b3289 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/School.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/School.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.query.objectloading.mixedhierarchy; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.MappedSuperclass; /** * @author Gunnar Morling diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/University.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/University.java index c16f6340e8e..2a4175e9af2 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/University.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/objectloading/mixedhierarchy/University.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.query.objectloading.mixedhierarchy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/BrickLayer.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/BrickLayer.java index b2e270be191..b664119e637 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/BrickLayer.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/BrickLayer.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.query.sorting; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/SortTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/SortTest.java index cc9e3b09965..1ea813bcde4 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/SortTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/SortTest.java @@ -17,9 +17,9 @@ import java.util.Locale; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/SortUsingEntityManagerTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/SortUsingEntityManagerTest.java index 344fd169164..3cd3695049e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/SortUsingEntityManagerTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/sorting/SortUsingEntityManagerTest.java @@ -14,7 +14,7 @@ import java.util.Locale; import java.util.TimeZone; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityTransaction; import org.apache.lucene.search.Sort; import org.hibernate.search.jpa.FullTextEntityManager; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/Clock.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/Clock.java index 44df6a5cf23..e057c8800d1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/Clock.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/Clock.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.query.timeout; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/JPATimeoutTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/JPATimeoutTest.java index 8fde1e7dd96..047efb544f1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/JPATimeoutTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/JPATimeoutTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.persistence.QueryTimeoutException; +import jakarta.persistence.QueryTimeoutException; import org.apache.lucene.search.Query; @@ -57,7 +57,7 @@ public void testQueryTimeoutException() throws Exception { em.getTransaction().begin(); FullTextQuery hibernateQuery = em.createFullTextQuery( slowQuery, Clock.class ); - hibernateQuery.setHint( "javax.persistence.query.timeout", 1 ); + hibernateQuery.setHint( "jakarta.persistence.query.timeout", 1 ); try { hibernateQuery.getResultList(); fail( "timeout exception should happen" ); diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/TimeoutTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/TimeoutTest.java index 7dc1c969849..5078ea994b5 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/TimeoutTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/timeout/TimeoutTest.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.persistence.QueryTimeoutException; +import jakarta.persistence.QueryTimeoutException; import org.hibernate.ScrollableResults; import org.hibernate.Transaction; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/validation/QueryValidationTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/validation/QueryValidationTest.java index 1af339fdbab..d833b73fa9a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/validation/QueryValidationTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/validation/QueryValidationTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.query.validation; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.lucene.index.Term; import org.apache.lucene.search.TermQuery; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Categorie.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Categorie.java index 9a775118bba..7df55fad893 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Categorie.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Categorie.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.session; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Domain.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Domain.java index 8880e252ce9..487f8f3aaa8 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Domain.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Domain.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.session; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.DocumentId; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Email.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Email.java index 7f5cb17f4b9..9822e5fb10d 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Email.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Email.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.test.session; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Entite.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Entite.java index bf35a8f0a48..13f05fc138e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Entite.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Entite.java @@ -6,11 +6,11 @@ */ package org.hibernate.search.test.session; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/DoubleIndexedPOI.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/DoubleIndexedPOI.java index 13902596d3b..9df4b593d28 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/DoubleIndexedPOI.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/DoubleIndexedPOI.java @@ -19,9 +19,9 @@ import org.hibernate.search.mapper.pojo.mapping.definition.annotation.PropertyValue; import org.hibernate.search.spatial.Coordinates; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Hibernate Search spatial : Double indexed Point Of Interest test entity for diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Event.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Event.java index 04f4571d243..2fe6c57582e 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Event.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Event.java @@ -18,9 +18,9 @@ import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Hibernate Search spatial : Event test entity diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/GetterUser.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/GetterUser.java index a23e17d57ce..81e8c681615 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/GetterUser.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/GetterUser.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.spatial; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Latitude; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Hotel.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Hotel.java index afcb487d9fd..2896165ce00 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Hotel.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Hotel.java @@ -13,8 +13,8 @@ import org.hibernate.search.annotations.Store; import org.hibernate.search.spatial.Coordinates; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Hibernate Search spatial : Point Of Interest test entity diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/MissingSpatialPOI.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/MissingSpatialPOI.java index 162756de185..82bdb3e478b 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/MissingSpatialPOI.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/MissingSpatialPOI.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.spatial; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Index; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/NonGeoPOI.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/NonGeoPOI.java index a0fe95a2b39..9da132a4f90 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/NonGeoPOI.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/NonGeoPOI.java @@ -11,8 +11,8 @@ import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Store; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Hibernate Search spatial : Non Geo enabled Point Of Interest test entity diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/POI.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/POI.java index 83dde1dcb4d..b5e29910f35 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/POI.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/POI.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.spatial; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Index; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Position.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Position.java index 92fdffb3c4b..82aca0ff3da 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Position.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Position.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.test.spatial; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.hibernate.search.annotations.Spatial; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/RangeEvent.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/RangeEvent.java index 44feeeb1e17..a902145cf71 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/RangeEvent.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/RangeEvent.java @@ -18,9 +18,9 @@ import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Hibernate Search spatial : Event test entity diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/RangeHotel.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/RangeHotel.java index 095ceab138f..a993ea1fca1 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/RangeHotel.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/RangeHotel.java @@ -13,8 +13,8 @@ import org.hibernate.search.annotations.Store; import org.hibernate.search.spatial.Coordinates; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Hibernate Search spatial: Hotel test entity with Range Spatial indexation diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Restaurant.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Restaurant.java index e54bcf9097f..005e0abd76a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Restaurant.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/Restaurant.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.spatial; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/SpatialContainedInTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/SpatialContainedInTest.java index a4eb080356d..3565db19de0 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/SpatialContainedInTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/SpatialContainedInTest.java @@ -9,10 +9,10 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/SpatialSearchSortByDistanceAndPagingTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/SpatialSearchSortByDistanceAndPagingTest.java index 9b44dfcd5d6..2d4ee8f644a 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/SpatialSearchSortByDistanceAndPagingTest.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/SpatialSearchSortByDistanceAndPagingTest.java @@ -15,12 +15,12 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import org.hibernate.Session; import org.hibernate.search.FullTextQuery; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/User.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/User.java index cf3f00cea97..9b6ad1d5999 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/User.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/User.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.test.spatial; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Latitude; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/UserEx.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/UserEx.java index 7cfa4636ca0..9e5535a21c0 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/UserEx.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/UserEx.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.spatial; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Latitude; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/UserRange.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/UserRange.java index 912ee4f6924..4ea4528e688 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/UserRange.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/spatial/UserRange.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.test.spatial; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Latitude; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/testsupport/V5MigrationHelperJPASetupHelper.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/testsupport/V5MigrationHelperJPASetupHelper.java index a9d8fde1717..1b42948e947 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/testsupport/V5MigrationHelperJPASetupHelper.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/testsupport/V5MigrationHelperJPASetupHelper.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings; import org.hibernate.search.engine.cfg.BackendSettings; diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/util/ResourceCleanupFunctions.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/util/ResourceCleanupFunctions.java index c801fcfa1bb..83d62252e42 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/util/ResourceCleanupFunctions.java +++ b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/util/ResourceCleanupFunctions.java @@ -8,9 +8,9 @@ import java.util.function.Consumer; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; import org.hibernate.search.jpa.FullTextEntityManager; import org.hibernate.search.jpa.Search; diff --git a/integrationtest/v5migrationhelper/orm/src/test/resources/META-INF/persistence.xml b/integrationtest/v5migrationhelper/orm/src/test/resources/META-INF/persistence.xml index 3fbbf07d6d1..a7072139486 100644 --- a/integrationtest/v5migrationhelper/orm/src/test/resources/META-INF/persistence.xml +++ b/integrationtest/v5migrationhelper/orm/src/test/resources/META-INF/persistence.xml @@ -5,7 +5,7 @@ ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later ~ See the lgpl.txt file in the root directory or . --> - + org.hibernate.search.test.jpa.Bretzel diff --git a/jakarta/ant-copy-and-transform-sources.xml b/jakarta/ant-copy-and-transform-sources.xml deleted file mode 100644 index e4a830a59c2..00000000000 --- a/jakarta/ant-copy-and-transform-sources.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - version="1.2" - version="3.0" - - - version="2.0" - version="3.0" - - - - - - - - - - - - - - - - version="1.0"> - version="3.0"> - - - version="2.0" - version="3.0" - - - version="2.1" - version="3.0" - - - version="2.2" - version="3.0" - - - - - - - - - - version="1.0"> - version="2.0"> - - - - \ No newline at end of file diff --git a/javaee/ant-copy-and-transform-sources.xml b/javaee/ant-copy-and-transform-sources.xml new file mode 100644 index 00000000000..0e65db6a810 --- /dev/null +++ b/javaee/ant-copy-and-transform-sources.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + version="1.2" + version="3.0" + + + version="2.0" + version="3.0" + + + + + + + + version="3.0" + version="2.2" + + + + + + + version="2.0" + version="1.0" + + + + \ No newline at end of file diff --git a/jakarta/build/parents/integrationtest/pom.xml b/javaee/build/parents/integrationtest/pom.xml similarity index 93% rename from jakarta/build/parents/integrationtest/pom.xml rename to javaee/build/parents/integrationtest/pom.xml index 746a4c4de75..b007d592936 100644 --- a/jakarta/build/parents/integrationtest/pom.xml +++ b/javaee/build/parents/integrationtest/pom.xml @@ -14,11 +14,11 @@ 6.2.0-SNAPSHOT ../../../../build/parents/integrationtest - hibernate-search-parent-integrationtest-jakarta + hibernate-search-parent-integrationtest-javaee pom - Hibernate Search Parent POM for Integration Test Artifacts - Jakarta EE - Common build configuration for all Jakarta EE integration test artifacts (including documentation) + Hibernate Search Parent POM for Integration Test Artifacts - Java EE + Common build configuration for all Java EE integration test artifacts (including documentation) jakarta @@ -74,12 +74,12 @@ org.jboss.weld.se weld-se-shaded - ${version.org.jboss.weld.jakarta} + ${version.org.jboss.weld.javaee} org.jberet jberet-core - ${version.org.jberet.jakarta} + ${version.org.jberet.javaee} @@ -100,27 +100,27 @@ org.jberet jberet-se - ${version.org.jberet.jakarta} + ${version.org.jberet.javaee} org.hibernate.search - hibernate-search-util-internal-integrationtest-mapper-orm-jakarta + hibernate-search-util-internal-integrationtest-mapper-orm-javaee ${project.version} org.hibernate.search - hibernate-search-util-internal-integrationtest-v5migrationhelper-jakarta + hibernate-search-util-internal-integrationtest-v5migrationhelper-javaee ${project.version} org.hibernate.search - hibernate-search-util-internal-integrationtest-jbatch-runtime-jakarta + hibernate-search-util-internal-integrationtest-jbatch-runtime-javaee ${project.version} org.hibernate.search - hibernate-search-util-internal-integrationtest-jberet-se-jakarta + hibernate-search-util-internal-integrationtest-jberet-se-javaee ${project.version} @@ -142,7 +142,7 @@ - + diff --git a/jakarta/build/parents/internal/pom.xml b/javaee/build/parents/internal/pom.xml similarity index 94% rename from jakarta/build/parents/internal/pom.xml rename to javaee/build/parents/internal/pom.xml index f3549aff841..99f502b0668 100644 --- a/jakarta/build/parents/internal/pom.xml +++ b/javaee/build/parents/internal/pom.xml @@ -14,11 +14,11 @@ 6.2.0-SNAPSHOT ../../../../build/parents/internal - hibernate-search-parent-internal-jakarta + hibernate-search-parent-internal-javaee pom - Hibernate Search Parent POM for Internal Artifacts - Jakarta EE - Common build configuration for all internal (non-published) artifacts - Jakarta EE version + Hibernate Search Parent POM for Internal Artifacts - Java EE + Common build configuration for all internal (non-published) artifacts - Java EE version jakarta @@ -74,12 +74,12 @@ org.jboss.weld.se weld-se-shaded - ${version.org.jboss.weld.jakarta} + ${version.org.jboss.weld.javaee} org.jberet jberet-core - ${version.org.jberet.jakarta} + ${version.org.jberet.javaee} @@ -100,27 +100,27 @@ org.jberet jberet-se - ${version.org.jberet.jakarta} + ${version.org.jberet.javaee} org.hibernate.search - hibernate-search-util-internal-integrationtest-mapper-orm-jakarta + hibernate-search-util-internal-integrationtest-mapper-orm-javaee ${project.version} org.hibernate.search - hibernate-search-util-internal-integrationtest-v5migrationhelper-jakarta + hibernate-search-util-internal-integrationtest-v5migrationhelper-javaee ${project.version} org.hibernate.search - hibernate-search-util-internal-integrationtest-jbatch-runtime-jakarta + hibernate-search-util-internal-integrationtest-jbatch-runtime-javaee ${project.version} org.hibernate.search - hibernate-search-util-internal-integrationtest-jberet-se-jakarta + hibernate-search-util-internal-integrationtest-jberet-se-javaee ${project.version} @@ -142,7 +142,7 @@ - + diff --git a/jakarta/build/parents/public/pom.xml b/javaee/build/parents/public/pom.xml similarity index 95% rename from jakarta/build/parents/public/pom.xml rename to javaee/build/parents/public/pom.xml index f6b1e623dbe..0cbd39c1356 100644 --- a/jakarta/build/parents/public/pom.xml +++ b/javaee/build/parents/public/pom.xml @@ -14,11 +14,11 @@ 6.2.0-SNAPSHOT ../../../../build/parents/public - hibernate-search-parent-public-jakarta + hibernate-search-parent-public-javaee pom - Hibernate Search Parent POM for Public Artifacts - Jakarta EE - Common build configuration for all Jakarta EE public artifacts + Hibernate Search Parent POM for Public Artifacts - Java EE + Common build configuration for all Java EE public artifacts jakarta @@ -74,7 +74,7 @@ org.jberet jberet-core - ${version.org.jberet.jakarta} + ${version.org.jberet.javaee} @@ -111,7 +111,7 @@ - + diff --git a/jakarta/documentation/pom.xml b/javaee/documentation/pom.xml similarity index 93% rename from jakarta/documentation/pom.xml rename to javaee/documentation/pom.xml index 99077c48009..e98bd01de21 100644 --- a/jakarta/documentation/pom.xml +++ b/javaee/documentation/pom.xml @@ -9,15 +9,15 @@ 4.0.0 org.hibernate.search - hibernate-search-parent-integrationtest-jakarta + hibernate-search-parent-integrationtest-javaee 6.2.0-SNAPSHOT ../build/parents/integrationtest - hibernate-search-documentation-jakarta + hibernate-search-documentation-javaee jar - Hibernate Search Documentation - Tests only - Jakarta EE - Re-execution of Hibernate Search reference documentation tests with Jakarta EE + Hibernate Search Documentation - Tests only - Java EE + Re-execution of Hibernate Search reference documentation tests with Java EE documentation @@ -29,7 +29,7 @@ ${project.groupId} - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee test @@ -49,7 +49,7 @@ ${project.groupId} - hibernate-search-util-internal-integrationtest-mapper-orm-jakarta + hibernate-search-util-internal-integrationtest-mapper-orm-javaee test @@ -80,12 +80,12 @@ ${project.groupId} - hibernate-search-mapper-orm-batch-jsr352-core-jakarta + hibernate-search-mapper-orm-batch-jsr352-core-javaee test ${project.groupId} - hibernate-search-util-internal-integrationtest-jbatch-runtime-jakarta + hibernate-search-util-internal-integrationtest-jbatch-runtime-javaee test diff --git a/jakarta/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml b/javaee/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml similarity index 91% rename from jakarta/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml rename to javaee/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml index 28cae5e755b..54386c40c9e 100644 --- a/jakarta/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml +++ b/javaee/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml @@ -6,14 +6,14 @@ org.hibernate.search - hibernate-search-integrationtest-jakarta + hibernate-search-integrationtest-javaee 6.2.0-SNAPSHOT ../../.. - hibernate-search-integrationtest-java-modules-orm-coordination-outbox-polling-elasticsearch-jakarta + hibernate-search-integrationtest-java-modules-orm-coordination-outbox-polling-elasticsearch-javaee jar - Hibernate Search ITs - Java - Modules - ORM/Elasticsearch outbox polling - Jakarta EE + Hibernate Search ITs - Java - Modules - ORM/Elasticsearch outbox polling - Java EE Hibernate Search integration tests for Java 11+ modules @@ -34,7 +34,7 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee org.hibernate.search @@ -43,12 +43,12 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling-jakarta + hibernate-search-mapper-orm-coordination-outbox-polling-javaee org.hibernate.search - hibernate-search-util-internal-test-orm-jakarta + hibernate-search-util-internal-test-orm-javaee test diff --git a/jakarta/integrationtest/java/modules/orm-elasticsearch/pom.xml b/javaee/integrationtest/java/modules/orm-elasticsearch/pom.xml similarity index 92% rename from jakarta/integrationtest/java/modules/orm-elasticsearch/pom.xml rename to javaee/integrationtest/java/modules/orm-elasticsearch/pom.xml index 611b8577394..a5754a3a8ce 100644 --- a/jakarta/integrationtest/java/modules/orm-elasticsearch/pom.xml +++ b/javaee/integrationtest/java/modules/orm-elasticsearch/pom.xml @@ -6,14 +6,14 @@ org.hibernate.search - hibernate-search-integrationtest-jakarta + hibernate-search-integrationtest-javaee 6.2.0-SNAPSHOT ../../.. - hibernate-search-integrationtest-java-modules-orm-elasticsearch-jakarta + hibernate-search-integrationtest-java-modules-orm-elasticsearch-javaee jar - Hibernate Search ITs - Java - Modules - ORM/Elasticsearch - Jakarta EE + Hibernate Search ITs - Java - Modules - ORM/Elasticsearch - Java EE Hibernate Search integration tests for Java 11+ modules @@ -34,7 +34,7 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee org.hibernate.search @@ -43,7 +43,7 @@ org.hibernate.search - hibernate-search-util-internal-test-orm-jakarta + hibernate-search-util-internal-test-orm-javaee test diff --git a/jakarta/integrationtest/java/modules/orm-lucene/pom.xml b/javaee/integrationtest/java/modules/orm-lucene/pom.xml similarity index 92% rename from jakarta/integrationtest/java/modules/orm-lucene/pom.xml rename to javaee/integrationtest/java/modules/orm-lucene/pom.xml index f15c6e8f162..3edf8bb1453 100644 --- a/jakarta/integrationtest/java/modules/orm-lucene/pom.xml +++ b/javaee/integrationtest/java/modules/orm-lucene/pom.xml @@ -6,14 +6,14 @@ org.hibernate.search - hibernate-search-integrationtest-jakarta + hibernate-search-integrationtest-javaee 6.2.0-SNAPSHOT ../../.. - hibernate-search-integrationtest-java-modules-orm-lucene-jakarta + hibernate-search-integrationtest-java-modules-orm-lucene-javaee jar - Hibernate Search ITs - Java - Modules - ORM/Lucene - Jakarta EE + Hibernate Search ITs - Java - Modules - ORM/Lucene - Java EE Hibernate Search integration tests for Java 11+ modules @@ -29,7 +29,7 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee org.hibernate.search @@ -38,7 +38,7 @@ org.hibernate.search - hibernate-search-util-internal-test-orm-jakarta + hibernate-search-util-internal-test-orm-javaee test diff --git a/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml b/javaee/integrationtest/mapper/orm-batch-jsr352/pom.xml similarity index 92% rename from jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml rename to javaee/integrationtest/mapper/orm-batch-jsr352/pom.xml index 12521358036..362221cfa0a 100644 --- a/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml +++ b/javaee/integrationtest/mapper/orm-batch-jsr352/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.hibernate.search - hibernate-search-integrationtest-jakarta + hibernate-search-integrationtest-javaee 6.2.0-SNAPSHOT ../.. - hibernate-search-integrationtest-mapper-orm-batch-jsr352-jakarta + hibernate-search-integrationtest-mapper-orm-batch-jsr352-javaee - Hibernate Search ITs - ORM - Batch JSR-352 - Jakarta EE - Hibernate Search integration tests for the Batch JSR-352 integration - Jakarta EE version + Hibernate Search ITs - ORM - Batch JSR-352 - Java EE + Hibernate Search integration tests for the Batch JSR-352 integration - Java EE version integrationtest/mapper/orm-batch-jsr352 @@ -26,17 +26,17 @@ org.hibernate.search - hibernate-search-mapper-orm-batch-jsr352-core-jakarta + hibernate-search-mapper-orm-batch-jsr352-core-javaee test org.hibernate.search - hibernate-search-mapper-orm-batch-jsr352-jberet-jakarta + hibernate-search-mapper-orm-batch-jsr352-jberet-javaee test org.hibernate.search - hibernate-search-util-internal-integrationtest-mapper-orm-jakarta + hibernate-search-util-internal-integrationtest-mapper-orm-javaee test @@ -64,12 +64,12 @@ org.hibernate.search - hibernate-search-util-internal-integrationtest-jbatch-runtime-jakarta + hibernate-search-util-internal-integrationtest-jbatch-runtime-javaee test org.hibernate.search - hibernate-search-util-internal-integrationtest-jberet-se-jakarta + hibernate-search-util-internal-integrationtest-jberet-se-javaee test @@ -102,7 +102,7 @@ ${surefire.reportNameSuffix}-lucene-jbatch org.hibernate.search:hibernate-search-backend-elasticsearch - org.hibernate.search:hibernate-search-util-internal-integrationtest-jberet-se-jakarta + org.hibernate.search:hibernate-search-util-internal-integrationtest-jberet-se-javaee org.jberet:jberet-core org.jberet:jberet-se @@ -121,8 +121,8 @@ ${surefire.reportNameSuffix}-lucene-jberet org.hibernate.search:hibernate-search-backend-elasticsearch - org.hibernate.search:hibernate-search-util-internal-integrationtest-jbatch-runtime-jakarta - com.ibm.jbatch:com.ibm.jbatch.container + org.hibernate.search:hibernate-search-util-internal-integrationtest-jbatch-runtime-javaee + com.ibm.jbatch:com.ibm.jbatch-runtime lucene @@ -139,7 +139,7 @@ ${surefire.reportNameSuffix}-elasticsearch-jbatch org.hibernate.search:hibernate-search-backend-lucene - org.hibernate.search:hibernate-search-util-internal-integrationtest-jberet-se-jakarta + org.hibernate.search:hibernate-search-util-internal-integrationtest-jberet-se-javaee org.jberet:jberet-core org.jberet:jberet-se @@ -158,8 +158,8 @@ ${surefire.reportNameSuffix}-elasticsearch-jberet org.hibernate.search:hibernate-search-backend-lucene - org.hibernate.search:hibernate-search-util-internal-integrationtest-jbatch-runtime-jakarta - com.ibm.jbatch:com.ibm.jbatch.container + org.hibernate.search:hibernate-search-util-internal-integrationtest-jbatch-runtime-javaee + com.ibm.jbatch:com.ibm.jbatch-runtime elasticsearch diff --git a/jakarta/integrationtest/mapper/orm-cdi/pom.xml b/javaee/integrationtest/mapper/orm-cdi/pom.xml similarity index 85% rename from jakarta/integrationtest/mapper/orm-cdi/pom.xml rename to javaee/integrationtest/mapper/orm-cdi/pom.xml index 650f0c0682d..48df3986e93 100644 --- a/jakarta/integrationtest/mapper/orm-cdi/pom.xml +++ b/javaee/integrationtest/mapper/orm-cdi/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.hibernate.search - hibernate-search-integrationtest-jakarta + hibernate-search-integrationtest-javaee 6.2.0-SNAPSHOT ../.. - hibernate-search-integrationtest-mapper-orm-cdi-jakarta + hibernate-search-integrationtest-mapper-orm-cdi-javaee - Hibernate Search ITs - ORM - CDI - Jakarta EE - Hibernate Search integration tests for the Hibernate ORM integration with CDI - Jakarta EE version + Hibernate Search ITs - ORM - CDI - Java EE + Hibernate Search integration tests for the Hibernate ORM integration with CDI - Java EE version integrationtest/mapper/orm-cdi @@ -23,17 +23,17 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee test org.hibernate.search - hibernate-search-util-internal-integrationtest-mapper-orm-jakarta + hibernate-search-util-internal-integrationtest-mapper-orm-javaee test - jakarta.enterprise - jakarta.enterprise.cdi-api + javax.enterprise + cdi-api ${version.jakarta.enterprise} test diff --git a/jakarta/integrationtest/mapper/orm-coordination-outbox-polling/pom.xml b/javaee/integrationtest/mapper/orm-coordination-outbox-polling/pom.xml similarity index 93% rename from jakarta/integrationtest/mapper/orm-coordination-outbox-polling/pom.xml rename to javaee/integrationtest/mapper/orm-coordination-outbox-polling/pom.xml index ae7aa09b9c0..cd861c76d29 100644 --- a/jakarta/integrationtest/mapper/orm-coordination-outbox-polling/pom.xml +++ b/javaee/integrationtest/mapper/orm-coordination-outbox-polling/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.hibernate.search - hibernate-search-integrationtest-jakarta + hibernate-search-integrationtest-javaee 6.2.0-SNAPSHOT ../.. - hibernate-search-integrationtest-mapper-orm-coordination-outbox-polling-jakarta + hibernate-search-integrationtest-mapper-orm-coordination-outbox-polling-javaee - Hibernate Search ITs - ORM - Coordination - Outbox Polling - Jakarta EE - Hibernate Search integration tests for the Hibernate ORM integration using outbox polling as coordination strategy - Jakarta EE version + Hibernate Search ITs - ORM - Coordination - Outbox Polling - Java EE + Hibernate Search integration tests for the Hibernate ORM integration using outbox polling as coordination strategy - Java EE version coord-outbox @@ -23,22 +23,22 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee test org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling-jakarta + hibernate-search-mapper-orm-coordination-outbox-polling-javaee test org.hibernate.search - hibernate-search-util-internal-integrationtest-mapper-orm-jakarta + hibernate-search-util-internal-integrationtest-mapper-orm-javaee test org.hibernate.search - hibernate-search-integrationtest-mapper-orm-jakarta + hibernate-search-integrationtest-mapper-orm-javaee tests test-jar ${project.version} diff --git a/jakarta/integrationtest/mapper/orm-envers/pom.xml b/javaee/integrationtest/mapper/orm-envers/pom.xml similarity index 86% rename from jakarta/integrationtest/mapper/orm-envers/pom.xml rename to javaee/integrationtest/mapper/orm-envers/pom.xml index 6b0b40cda9e..d2c4c530f1d 100644 --- a/jakarta/integrationtest/mapper/orm-envers/pom.xml +++ b/javaee/integrationtest/mapper/orm-envers/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.hibernate.search - hibernate-search-integrationtest-jakarta + hibernate-search-integrationtest-javaee 6.2.0-SNAPSHOT ../.. - hibernate-search-integrationtest-mapper-orm-envers-jakarta + hibernate-search-integrationtest-mapper-orm-envers-javaee - Hibernate Search ITs - ORM - Envers - Jakarta EE - Hibernate Search integration tests for the Hibernate ORM integration with Envers - Jakarta EE version + Hibernate Search ITs - ORM - Envers - Java EE + Hibernate Search integration tests for the Hibernate ORM integration with Envers - Java EE version integrationtest/mapper/orm-envers @@ -21,17 +21,17 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee test org.hibernate - hibernate-envers-jakarta + hibernate-envers test org.hibernate.search - hibernate-search-util-internal-integrationtest-mapper-orm-jakarta + hibernate-search-util-internal-integrationtest-mapper-orm-javaee test ${version.jakarta.enterprise} provided diff --git a/jakarta/mapper/orm-coordination-outbox-polling/pom.xml b/javaee/mapper/orm-coordination-outbox-polling/pom.xml similarity index 94% rename from jakarta/mapper/orm-coordination-outbox-polling/pom.xml rename to javaee/mapper/orm-coordination-outbox-polling/pom.xml index 8d42a36e596..6dcc995333f 100644 --- a/jakarta/mapper/orm-coordination-outbox-polling/pom.xml +++ b/javaee/mapper/orm-coordination-outbox-polling/pom.xml @@ -5,14 +5,14 @@ 4.0.0 org.hibernate.search - hibernate-search-parent-public-jakarta + hibernate-search-parent-public-javaee 6.2.0-SNAPSHOT ../../build/parents/public - hibernate-search-mapper-orm-coordination-outbox-polling-jakarta + hibernate-search-mapper-orm-coordination-outbox-polling-javaee - Hibernate Search ORM Integration - Coordination - Outbox Polling - Jakarta EE - Hibernate ORM integration using outbox polling as coordination strategy - Jakarta EE version + Hibernate Search ORM Integration - Coordination - Outbox Polling - Java EE + Hibernate ORM integration using outbox polling as coordination strategy - Java EE version mapper/orm-coordination-outbox-polling @@ -23,7 +23,7 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee org.jboss.logging @@ -39,7 +39,7 @@ org.hibernate.search - hibernate-search-util-internal-test-orm-jakarta + hibernate-search-util-internal-test-orm-javaee test diff --git a/jakarta/mapper/orm/pom.xml b/javaee/mapper/orm/pom.xml similarity index 71% rename from jakarta/mapper/orm/pom.xml rename to javaee/mapper/orm/pom.xml index aab67a63b3e..57474e3da09 100644 --- a/jakarta/mapper/orm/pom.xml +++ b/javaee/mapper/orm/pom.xml @@ -5,14 +5,14 @@ 4.0.0 org.hibernate.search - hibernate-search-parent-public-jakarta + hibernate-search-parent-public-javaee 6.2.0-SNAPSHOT ../../build/parents/public - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee - Hibernate Search ORM Integration - Jakarta EE - Hibernate Search integration to Hibernate ORM - Jakarta EE version + Hibernate Search ORM Integration - Java EE + Hibernate Search integration to Hibernate ORM - Java EE version mapper/orm @@ -35,7 +35,7 @@ org.hibernate - hibernate-core-jakarta + hibernate-core org.jboss @@ -44,23 +44,23 @@ ${version.org.jboss.jandex} - jakarta.persistence + javax.persistence jakarta.persistence-api - ${version.jakarta.persistence} + ${version.javax.persistence} - jakarta.enterprise - jakarta.enterprise.cdi-api + javax.enterprise + cdi-api - ${version.jakarta.enterprise} + ${version.javax.enterprise} provided - jakarta.transaction - jakarta.transaction-api + javax.transaction + javax.transaction-api - ${version.jakarta.transaction-api} + ${version.javax.transaction-api} org.hibernate.common @@ -79,7 +79,7 @@ org.hibernate.search - hibernate-search-util-internal-test-orm-jakarta + hibernate-search-util-internal-test-orm-javaee test @@ -102,21 +102,12 @@ add-module-infos - - - - - static jakarta.cdi; - org.hibernate.*.impl; - org.hibernate.*.internal; - org.hibernate.*.impl.*; - org.hibernate.*.internal.*; - transitive org.hibernate.*; - *; - - - - + + none diff --git a/jakarta/pom.xml b/javaee/pom.xml similarity index 86% rename from jakarta/pom.xml rename to javaee/pom.xml index 4842e5074a1..80487288be0 100644 --- a/jakarta/pom.xml +++ b/javaee/pom.xml @@ -14,11 +14,11 @@ 6.2.0-SNAPSHOT .. - hibernate-search-jakarta-parent + hibernate-search-javaee-parent pom - Hibernate Search Aggregator POM for Jakarta EE Artifacts - Hibernate Search Aggregator POM for Jakarta EE Artifacts + Hibernate Search Aggregator POM for Java EE Artifacts + Hibernate Search Aggregator POM for Java EE Artifacts build/parents/public diff --git a/jakarta/util/internal/integrationtest/jbatch-runtime/pom.xml b/javaee/util/internal/integrationtest/jbatch-runtime/pom.xml similarity index 86% rename from jakarta/util/internal/integrationtest/jbatch-runtime/pom.xml rename to javaee/util/internal/integrationtest/jbatch-runtime/pom.xml index 3b3a4edddf7..196bf534c57 100644 --- a/jakarta/util/internal/integrationtest/jbatch-runtime/pom.xml +++ b/javaee/util/internal/integrationtest/jbatch-runtime/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.hibernate.search - hibernate-search-util-internal-integrationtest-jakarta + hibernate-search-util-internal-integrationtest-javaee 6.2.0-SNAPSHOT .. - hibernate-search-util-internal-integrationtest-jbatch-runtime-jakarta + hibernate-search-util-internal-integrationtest-jbatch-runtime-javaee - Hibernate Search Utils - Internal - ITs - JBatch Runtime - Jakarta EE - JBatch-runtime and runtime dependencies - Jakarta EE version + Hibernate Search Utils - Internal - ITs - JBatch Runtime - Java EE + JBatch-runtime and runtime dependencies - Java EE version util/internal/integrationtest/jbatch-runtime @@ -25,12 +25,12 @@ com.ibm.jbatch - com.ibm.jbatch.container + com.ibm.jbatch-runtime compile - jakarta.batch - jakarta.batch-api + javax.batch + javax.batch-api compile diff --git a/jakarta/util/internal/integrationtest/jberet-se/pom.xml b/javaee/util/internal/integrationtest/jberet-se/pom.xml similarity index 95% rename from jakarta/util/internal/integrationtest/jberet-se/pom.xml rename to javaee/util/internal/integrationtest/jberet-se/pom.xml index ed324ef2707..918be894564 100644 --- a/jakarta/util/internal/integrationtest/jberet-se/pom.xml +++ b/javaee/util/internal/integrationtest/jberet-se/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.hibernate.search - hibernate-search-util-internal-integrationtest-jakarta + hibernate-search-util-internal-integrationtest-javaee 6.2.0-SNAPSHOT .. - hibernate-search-util-internal-integrationtest-jberet-se-jakarta + hibernate-search-util-internal-integrationtest-jberet-se-javaee - Hibernate Search Utils - Internal - ITs - JBeret SE - Jakarta EE - JBeret-SE and runtime dependencies - Jakarta EE version + Hibernate Search Utils - Internal - ITs - JBeret SE - Java EE + JBeret-SE and runtime dependencies - Java EE version util/internal/integrationtest/jberet-se diff --git a/jakarta/util/internal/integrationtest/mapper/orm/pom.xml b/javaee/util/internal/integrationtest/mapper/orm/pom.xml similarity index 86% rename from jakarta/util/internal/integrationtest/mapper/orm/pom.xml rename to javaee/util/internal/integrationtest/mapper/orm/pom.xml index 7e70f750bfe..8645a515ef3 100644 --- a/jakarta/util/internal/integrationtest/mapper/orm/pom.xml +++ b/javaee/util/internal/integrationtest/mapper/orm/pom.xml @@ -10,14 +10,14 @@ 4.0.0 org.hibernate.search - hibernate-search-util-internal-integrationtest-jakarta + hibernate-search-util-internal-integrationtest-javaee 6.2.0-SNAPSHOT ../.. - hibernate-search-util-internal-integrationtest-mapper-orm-jakarta + hibernate-search-util-internal-integrationtest-mapper-orm-javaee - Hibernate Search Utils - Internal - ITs - ORM Mapper - Jakarta EE - Hibernate Search integration testing utilities for tests involving the Hibernate ORM Mapper - Jakarta EE version + Hibernate Search Utils - Internal - ITs - ORM Mapper - Java EE + Hibernate Search integration testing utilities for tests involving the Hibernate ORM Mapper - Java EE version util/internal/integrationtest/mapper/orm @@ -26,7 +26,7 @@ org.hibernate.search - hibernate-search-util-internal-test-orm-jakarta + hibernate-search-util-internal-test-orm-javaee org.hibernate.search @@ -43,15 +43,15 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee org.hibernate - hibernate-core-jakarta + hibernate-core org.hibernate - hibernate-testing-jakarta + hibernate-testing diff --git a/jakarta/util/internal/integrationtest/pom.xml b/javaee/util/internal/integrationtest/pom.xml similarity index 88% rename from jakarta/util/internal/integrationtest/pom.xml rename to javaee/util/internal/integrationtest/pom.xml index 5b2709874bf..464680d39c6 100644 --- a/jakarta/util/internal/integrationtest/pom.xml +++ b/javaee/util/internal/integrationtest/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.hibernate.search - hibernate-search-parent-internal-jakarta + hibernate-search-parent-internal-javaee 6.2.0-SNAPSHOT ../../../build/parents/internal - hibernate-search-util-internal-integrationtest-jakarta + hibernate-search-util-internal-integrationtest-javaee pom - Hibernate Search Utils - Internal - ITs - Jakarta EE - Aggregator POM + Hibernate Search Utils - Internal - ITs - Java EE - Aggregator POM Aggregator POM of Hibernate Search integration testing utilities diff --git a/jakarta/util/internal/test/orm/pom.xml b/javaee/util/internal/test/orm/pom.xml similarity index 71% rename from jakarta/util/internal/test/orm/pom.xml rename to javaee/util/internal/test/orm/pom.xml index 30d5d790864..759903316d6 100644 --- a/jakarta/util/internal/test/orm/pom.xml +++ b/javaee/util/internal/test/orm/pom.xml @@ -3,19 +3,23 @@ 4.0.0 org.hibernate.search - hibernate-search-parent-internal-jakarta + hibernate-search-parent-internal-javaee 6.2.0-SNAPSHOT ../../../../build/parents/internal - hibernate-search-util-internal-test-orm-jakarta + hibernate-search-util-internal-test-orm-javaee - Hibernate Search Utils - Internal - Test - ORM - Jakarta EE - Hibernate Search test utilities for modules using Hibernate ORM - Jakarta EE version + Hibernate Search Utils - Internal - Test - ORM - Java EE + Hibernate Search test utilities for modules using Hibernate ORM - Java EE version + + + util/internal/test/orm + org.hibernate - hibernate-core-jakarta + hibernate-core org.hibernate.search diff --git a/jakarta/v5migrationhelper/orm/pom.xml b/javaee/v5migrationhelper/orm/pom.xml similarity index 89% rename from jakarta/v5migrationhelper/orm/pom.xml rename to javaee/v5migrationhelper/orm/pom.xml index 52f03396959..2f7c148ac56 100644 --- a/jakarta/v5migrationhelper/orm/pom.xml +++ b/javaee/v5migrationhelper/orm/pom.xml @@ -9,15 +9,15 @@ 4.0.0 - hibernate-search-parent-public-jakarta + hibernate-search-parent-public-javaee org.hibernate.search 6.2.0-SNAPSHOT ../../build/parents/public - hibernate-search-v5migrationhelper-orm-jakarta + hibernate-search-v5migrationhelper-orm-javaee - Hibernate Search 5 Migration Helper - ORM - Jakarta EE - Helper to migrate from Hibernate Search 5 to 6, providing partial support for Hibernate Search 5 ORM APIs on top of Hibernate Search 6 - with Jakarta EE + Hibernate Search 5 Migration Helper - ORM - Java EE + Helper to migrate from Hibernate Search 5 to 6, providing partial support for Hibernate Search 5 ORM APIs on top of Hibernate Search 6 - with Java EE v5migrationhelper/orm @@ -37,7 +37,7 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee diff --git a/mapper/orm-batch-jsr352/core/pom.xml b/mapper/orm-batch-jsr352/core/pom.xml index 6ed1c60b8a3..6897eb1bbd4 100644 --- a/mapper/orm-batch-jsr352/core/pom.xml +++ b/mapper/orm-batch-jsr352/core/pom.xml @@ -41,12 +41,12 @@ jboss-logging-annotations - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api - javax.batch - javax.batch-api + jakarta.batch + jakarta.batch-api diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/context/jpa/impl/ActiveSessionFactoryRegistry.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/context/jpa/impl/ActiveSessionFactoryRegistry.java index 19a134b2c1e..8ca7d846a8e 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/context/jpa/impl/ActiveSessionFactoryRegistry.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/context/jpa/impl/ActiveSessionFactoryRegistry.java @@ -11,7 +11,7 @@ import java.util.HashSet; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/context/jpa/spi/EntityManagerFactoryRegistry.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/context/jpa/spi/EntityManagerFactoryRegistry.java index 1b5958112d4..3daf4bd271f 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/context/jpa/spi/EntityManagerFactoryRegistry.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/context/jpa/spi/EntityManagerFactoryRegistry.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.batch.jsr352.core.context.jpa.spi; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; /** * An abstract contract allowing to retrieve an entity manager factory. diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/inject/scope/spi/HibernateSearchJobScoped.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/inject/scope/spi/HibernateSearchJobScoped.java index 11fda79e319..3ed8a6eefdf 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/inject/scope/spi/HibernateSearchJobScoped.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/inject/scope/spi/HibernateSearchJobScoped.java @@ -13,7 +13,7 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Scope; +import jakarta.inject.Scope; /** * Scope for job execution, to be mapped to the scopes specific to each JSR-352 implementation. diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/inject/scope/spi/HibernateSearchPartitionScoped.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/inject/scope/spi/HibernateSearchPartitionScoped.java index 88259bbed78..133357a7103 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/inject/scope/spi/HibernateSearchPartitionScoped.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/inject/scope/spi/HibernateSearchPartitionScoped.java @@ -13,7 +13,7 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Scope; +import jakarta.inject.Scope; /** * Scope for partition execution, to be mapped to the scopes specific to each JSR-352 implementation. diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/MassIndexingJob.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/MassIndexingJob.java index a7e11cb339d..de0e8756c34 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/MassIndexingJob.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/MassIndexingJob.java @@ -12,7 +12,7 @@ import java.util.Properties; import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.CacheMode; import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJobParameters.Defaults; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/impl/JobContextData.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/impl/JobContextData.java index b2526609d1d..67b873e8c4f 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/impl/JobContextData.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/impl/JobContextData.java @@ -13,7 +13,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.stream.Collectors; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.batch.jsr352.core.massindexing.util.impl.EntityTypeDescriptor; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/spi/JobContextSetupListener.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/spi/JobContextSetupListener.java index dcaa8175934..c347142ee69 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/spi/JobContextSetupListener.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/spi/JobContextSetupListener.java @@ -21,11 +21,11 @@ import static org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJobParameters.ROWS_PER_PARTITION; import static org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJobParameters.SESSION_CLEAR_INTERVAL; -import javax.batch.api.BatchProperty; -import javax.batch.api.listener.AbstractJobListener; -import javax.batch.runtime.context.JobContext; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.batch.api.BatchProperty; +import jakarta.batch.api.listener.AbstractJobListener; +import jakarta.batch.runtime.context.JobContext; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.hibernate.search.batch.jsr352.core.context.jpa.spi.EntityManagerFactoryRegistry; import org.hibernate.search.batch.jsr352.core.inject.scope.spi.HibernateSearchJobScoped; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/afterchunk/impl/AfterChunkBatchlet.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/afterchunk/impl/AfterChunkBatchlet.java index 53a54672365..0b9e40df206 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/afterchunk/impl/AfterChunkBatchlet.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/afterchunk/impl/AfterChunkBatchlet.java @@ -9,11 +9,11 @@ import static org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJobParameters.MERGE_SEGMENTS_ON_FINISH; import java.lang.invoke.MethodHandles; -import javax.batch.api.AbstractBatchlet; -import javax.batch.api.BatchProperty; -import javax.batch.runtime.context.JobContext; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; +import jakarta.batch.api.AbstractBatchlet; +import jakarta.batch.api.BatchProperty; +import jakarta.batch.runtime.context.JobContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.batch.jsr352.core.logging.impl.Log; import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJobParameters; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/beforechunk/impl/BeforeChunkBatchlet.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/beforechunk/impl/BeforeChunkBatchlet.java index 34ad3e6f70f..5270881fbf9 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/beforechunk/impl/BeforeChunkBatchlet.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/beforechunk/impl/BeforeChunkBatchlet.java @@ -10,11 +10,11 @@ import static org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJobParameters.PURGE_ALL_ON_START; import java.lang.invoke.MethodHandles; -import javax.batch.api.AbstractBatchlet; -import javax.batch.api.BatchProperty; -import javax.batch.runtime.context.JobContext; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; +import jakarta.batch.api.AbstractBatchlet; +import jakarta.batch.api.BatchProperty; +import jakarta.batch.runtime.context.JobContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.batch.jsr352.core.logging.impl.Log; import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJobParameters; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/EntityWriter.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/EntityWriter.java index 109f02f1757..3040dae820d 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/EntityWriter.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/EntityWriter.java @@ -10,12 +10,12 @@ import java.lang.invoke.MethodHandles; import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.batch.api.BatchProperty; -import javax.batch.api.chunk.AbstractItemWriter; -import javax.batch.runtime.context.JobContext; -import javax.batch.runtime.context.StepContext; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; +import jakarta.batch.api.BatchProperty; +import jakarta.batch.api.chunk.AbstractItemWriter; +import jakarta.batch.runtime.context.JobContext; +import jakarta.batch.runtime.context.StepContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/HibernateSearchPartitionMapper.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/HibernateSearchPartitionMapper.java index a4b9b90749b..c8763c2b4ab 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/HibernateSearchPartitionMapper.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/HibernateSearchPartitionMapper.java @@ -16,19 +16,19 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import javax.batch.api.BatchProperty; -import javax.batch.api.partition.PartitionMapper; -import javax.batch.api.partition.PartitionPlan; -import javax.batch.api.partition.PartitionPlanImpl; -import javax.batch.runtime.context.JobContext; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; -import javax.persistence.LockModeType; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.batch.api.BatchProperty; +import jakarta.batch.api.partition.PartitionMapper; +import jakarta.batch.api.partition.PartitionPlan; +import jakarta.batch.api.partition.PartitionPlanImpl; +import jakarta.batch.runtime.context.JobContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.LockModeType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/ProgressAggregator.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/ProgressAggregator.java index 646546cc108..0147361f9fc 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/ProgressAggregator.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/ProgressAggregator.java @@ -10,9 +10,9 @@ import java.lang.invoke.MethodHandles; import java.util.Locale; import java.util.Map; -import javax.batch.api.partition.AbstractPartitionAnalyzer; -import javax.batch.runtime.context.StepContext; -import javax.inject.Inject; +import jakarta.batch.api.partition.AbstractPartitionAnalyzer; +import jakarta.batch.runtime.context.StepContext; +import jakarta.inject.Inject; import org.hibernate.search.batch.jsr352.core.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/ProgressCollector.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/ProgressCollector.java index 5b6229f4a89..c2d2dbcb3b0 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/ProgressCollector.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/ProgressCollector.java @@ -7,9 +7,9 @@ package org.hibernate.search.batch.jsr352.core.massindexing.step.impl; import java.io.Serializable; -import javax.batch.api.partition.PartitionCollector; -import javax.batch.runtime.context.StepContext; -import javax.inject.Inject; +import jakarta.batch.api.partition.PartitionCollector; +import jakarta.batch.runtime.context.StepContext; +import jakarta.inject.Inject; /** * Progress collectors run on the partitioned step threads and there's one collector per partition. They collect the diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/StepProgressSetupListener.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/StepProgressSetupListener.java index 1c862de3f9d..aaf70ee555f 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/StepProgressSetupListener.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/impl/StepProgressSetupListener.java @@ -8,14 +8,14 @@ import java.lang.invoke.MethodHandles; import java.util.function.BiFunction; -import javax.batch.api.BatchProperty; -import javax.batch.api.listener.AbstractStepListener; -import javax.batch.runtime.context.JobContext; -import javax.batch.runtime.context.StepContext; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.batch.api.BatchProperty; +import jakarta.batch.api.listener.AbstractStepListener; +import jakarta.batch.runtime.context.JobContext; +import jakarta.batch.runtime.context.StepContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Session; import org.hibernate.query.Query; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/spi/EntityReader.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/spi/EntityReader.java index e4b626af51c..6daddd71827 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/spi/EntityReader.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/spi/EntityReader.java @@ -17,18 +17,18 @@ import java.io.Serializable; import java.lang.invoke.MethodHandles; import java.util.ArrayList; -import javax.batch.api.BatchProperty; -import javax.batch.api.chunk.AbstractItemReader; -import javax.batch.runtime.context.JobContext; -import javax.batch.runtime.context.StepContext; -import javax.inject.Inject; -import javax.inject.Named; -import javax.persistence.EntityManagerFactory; -import javax.persistence.LockModeType; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.batch.api.BatchProperty; +import jakarta.batch.api.chunk.AbstractItemReader; +import jakarta.batch.runtime.context.JobContext; +import jakarta.batch.runtime.context.StepContext; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.LockModeType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/CompositeIdOrder.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/CompositeIdOrder.java index 5e4d2f5f9c7..a56e45f9d92 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/CompositeIdOrder.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/CompositeIdOrder.java @@ -12,13 +12,13 @@ import java.util.List; import java.util.ListIterator; import java.util.function.BiFunction; -import javax.persistence.EmbeddedId; -import javax.persistence.IdClass; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.IdClass; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.type.ComponentType; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/IdOrder.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/IdOrder.java index a9ecf7f29ca..16e25cd3a84 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/IdOrder.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/IdOrder.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.batch.jsr352.core.massindexing.util.impl; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; /** * Provides ID-based, order-sensitive restrictions diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/JobContextUtil.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/JobContextUtil.java index d6f04c27ebf..87c6614a7fe 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/JobContextUtil.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/JobContextUtil.java @@ -12,8 +12,8 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import javax.batch.runtime.context.JobContext; -import javax.persistence.EntityManagerFactory; +import jakarta.batch.runtime.context.JobContext; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.batch.jsr352.core.context.jpa.impl.ActiveSessionFactoryRegistry; import org.hibernate.search.batch.jsr352.core.context.jpa.spi.EntityManagerFactoryRegistry; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/PartitionBound.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/PartitionBound.java index 38da34ea95c..77feb08bb7b 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/PartitionBound.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/PartitionBound.java @@ -12,7 +12,7 @@ * Information about a target partition which can not be stored in the partition properties as String values. In * particular, the boundary properties help us to identify the lower boundary and upper boundary of a given partition, * with which the two ends of the scrollable results can be defined and be applied to - * {@link javax.batch.api.chunk.ItemReader#open}. + * {@link jakarta.batch.api.chunk.ItemReader#open}. * * @author Mincong Huang */ diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/PersistenceUtil.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/PersistenceUtil.java index aab44a1a104..e7132835a40 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/PersistenceUtil.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/PersistenceUtil.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/SingularIdOrder.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/SingularIdOrder.java index 77316eb1999..705d4197b3d 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/SingularIdOrder.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/SingularIdOrder.java @@ -6,10 +6,10 @@ */ package org.hibernate.search.batch.jsr352.core.massindexing.util.impl; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; /** * Order over a single ID attribute. diff --git a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/ValidationUtil.java b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/ValidationUtil.java index 22282f9f109..64c70f5aa59 100644 --- a/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/ValidationUtil.java +++ b/mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/ValidationUtil.java @@ -9,7 +9,7 @@ import java.lang.invoke.MethodHandles; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.batch.jsr352.core.context.jpa.spi.EntityManagerFactoryRegistry; import org.hibernate.search.batch.jsr352.core.logging.impl.Log; diff --git a/mapper/orm-batch-jsr352/core/src/main/resources/META-INF/batch-jobs/hibernate-search-mass-indexing.xml b/mapper/orm-batch-jsr352/core/src/main/resources/META-INF/batch-jobs/hibernate-search-mass-indexing.xml index 377beee1255..cc18996aa97 100644 --- a/mapper/orm-batch-jsr352/core/src/main/resources/META-INF/batch-jobs/hibernate-search-mass-indexing.xml +++ b/mapper/orm-batch-jsr352/core/src/main/resources/META-INF/batch-jobs/hibernate-search-mass-indexing.xml @@ -5,8 +5,8 @@ ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later ~ See the lgpl.txt file in the root directory or . --> - + diff --git a/mapper/orm-batch-jsr352/jberet/pom.xml b/mapper/orm-batch-jsr352/jberet/pom.xml index aa32e5169d4..8b8b1ba55aa 100644 --- a/mapper/orm-batch-jsr352/jberet/pom.xml +++ b/mapper/orm-batch-jsr352/jberet/pom.xml @@ -29,15 +29,15 @@ hibernate-search-mapper-orm-batch-jsr352-core - javax.batch - javax.batch-api + jakarta.batch + jakarta.batch-api provided - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api - ${version.javax.enterprise} + ${version.jakarta.enterprise} provided diff --git a/mapper/orm-batch-jsr352/jberet/src/main/java/org/hibernate/search/batch/jsr352/jberet/context/jpa/impl/JBeretEntityManagerFactoryRegistry.java b/mapper/orm-batch-jsr352/jberet/src/main/java/org/hibernate/search/batch/jsr352/jberet/context/jpa/impl/JBeretEntityManagerFactoryRegistry.java index f1d42c50b95..0092f45a783 100644 --- a/mapper/orm-batch-jsr352/jberet/src/main/java/org/hibernate/search/batch/jsr352/jberet/context/jpa/impl/JBeretEntityManagerFactoryRegistry.java +++ b/mapper/orm-batch-jsr352/jberet/src/main/java/org/hibernate/search/batch/jsr352/jberet/context/jpa/impl/JBeretEntityManagerFactoryRegistry.java @@ -7,20 +7,20 @@ package org.hibernate.search.batch.jsr352.jberet.context.jpa.impl; import java.lang.invoke.MethodHandles; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Vetoed; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanAttributes; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionTargetFactory; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Inject; -import javax.inject.Named; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnit; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanAttributes; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionTargetFactory; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnit; import org.hibernate.search.batch.jsr352.core.context.jpa.spi.EntityManagerFactoryRegistry; import org.hibernate.search.batch.jsr352.jberet.logging.impl.Log; diff --git a/mapper/orm-batch-jsr352/jberet/src/main/java/org/hibernate/search/batch/jsr352/jberet/impl/HibernateSearchJsr352Extension.java b/mapper/orm-batch-jsr352/jberet/src/main/java/org/hibernate/search/batch/jsr352/jberet/impl/HibernateSearchJsr352Extension.java index 5ae64e25f87..c9454d58f40 100644 --- a/mapper/orm-batch-jsr352/jberet/src/main/java/org/hibernate/search/batch/jsr352/jberet/impl/HibernateSearchJsr352Extension.java +++ b/mapper/orm-batch-jsr352/jberet/src/main/java/org/hibernate/search/batch/jsr352/jberet/impl/HibernateSearchJsr352Extension.java @@ -7,16 +7,16 @@ package org.hibernate.search.batch.jsr352.jberet.impl; import java.lang.annotation.Annotation; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.spi.Context; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.AfterTypeDiscovery; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.spi.Context; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.AfterTypeDiscovery; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.Extension; import org.hibernate.search.batch.jsr352.core.context.jpa.spi.EntityManagerFactoryRegistry; import org.hibernate.search.batch.jsr352.core.inject.scope.spi.HibernateSearchJobScoped; diff --git a/mapper/orm-batch-jsr352/jberet/src/main/resources/META-INF/beans.xml b/mapper/orm-batch-jsr352/jberet/src/main/resources/META-INF/beans.xml index c89ac3a3cdf..ca455af0d43 100644 --- a/mapper/orm-batch-jsr352/jberet/src/main/resources/META-INF/beans.xml +++ b/mapper/orm-batch-jsr352/jberet/src/main/resources/META-INF/beans.xml @@ -5,5 +5,5 @@ ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later ~ See the lgpl.txt file in the root directory or . --> - + diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/Agent.java b/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/Agent.java index 9ac5994b323..d843fd8ea65 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/Agent.java +++ b/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/Agent.java @@ -7,7 +7,7 @@ package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; import java.time.Instant; -import javax.persistence.Transient; +import jakarta.persistence.Transient; public class Agent { private Long id; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEvent.java b/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEvent.java index 2ddc1977f1e..29e193a3d56 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEvent.java +++ b/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEvent.java @@ -8,7 +8,7 @@ import java.time.Instant; import java.util.UUID; -import javax.persistence.Transient; +import jakarta.persistence.Transient; public final class OutboxEvent { diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventLoader.java b/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventLoader.java index d5cac0d8c4a..21d3f292542 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventLoader.java +++ b/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventLoader.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/Log.java b/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/Log.java index b843e4705ee..5e2963fde77 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/Log.java +++ b/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/Log.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentReference; diff --git a/mapper/orm/pom.xml b/mapper/orm/pom.xml index 8ba9ca04371..cd993ded5d1 100644 --- a/mapper/orm/pom.xml +++ b/mapper/orm/pom.xml @@ -33,21 +33,27 @@ org.hibernate - hibernate-core + hibernate-core-jakarta - javax.persistence - javax.persistence-api + jakarta.persistence + jakarta.persistence-api - ${version.javax.persistence} + ${version.jakarta.persistence} - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api - ${version.javax.enterprise} + ${version.jakarta.enterprise} provided + + jakarta.transaction + jakarta.transaction-api + + ${version.jakarta.transaction-api} + org.hibernate.common hibernate-commons-annotations @@ -85,12 +91,16 @@ add-module-infos - - none + + + + + static jakarta.cdi; + *; + + + + diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/Search.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/Search.java index be1072e91f3..0ea4743a520 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/Search.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/Search.java @@ -6,9 +6,9 @@ */ package org.hibernate.search.mapper.orm; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.TypedQuery; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/bootstrap/impl/ExtendedBeanManagerSynchronizer.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/bootstrap/impl/ExtendedBeanManagerSynchronizer.java index 72ac1a510b0..9dd93bd13f0 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/bootstrap/impl/ExtendedBeanManagerSynchronizer.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/bootstrap/impl/ExtendedBeanManagerSynchronizer.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import org.hibernate.resource.beans.container.spi.ExtendedBeanManager; import org.hibernate.search.mapper.orm.spi.EnvironmentSynchronizer; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/EntityReference.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/EntityReference.java index 695b5126880..5ee3e5558fd 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/EntityReference.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/EntityReference.java @@ -18,7 +18,7 @@ public interface EntityReference { /** * @return The name of the referenced entity in the Hibernate ORM mapping. - * @see javax.persistence.Entity#name() + * @see jakarta.persistence.Entity#name() */ String name(); diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/impl/HibernateOrmUtils.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/impl/HibernateOrmUtils.java index b428871d188..d6ed099098a 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/impl/HibernateOrmUtils.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/impl/HibernateOrmUtils.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.AssertionFailure; import org.hibernate.Session; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/spi/TransactionHelper.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/spi/TransactionHelper.java index 65bce3f81c1..3bed2676db3 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/spi/TransactionHelper.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/spi/TransactionHelper.java @@ -8,13 +8,13 @@ import java.lang.invoke.MethodHandles; import java.util.function.Supplier; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/entity/SearchIndexedEntity.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/entity/SearchIndexedEntity.java index bbdbacb9c70..cdb71899739 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/entity/SearchIndexedEntity.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/entity/SearchIndexedEntity.java @@ -17,7 +17,7 @@ public interface SearchIndexedEntity { /** - * @return The {@link javax.persistence.Entity#name() JPA name} of the entity. + * @return The {@link jakarta.persistence.Entity#name() JPA name} of the entity. */ String jpaName(); diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/AbstractHibernateOrmSelectionEntityLoader.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/AbstractHibernateOrmSelectionEntityLoader.java index 73185583308..4fa0ba9e1b3 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/AbstractHibernateOrmSelectionEntityLoader.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/AbstractHibernateOrmSelectionEntityLoader.java @@ -38,8 +38,8 @@ public final List loadBlocking(List identifiers, Deadline deadline) { try { return doLoadEntities( identifiers, timeout ); } - catch (QueryTimeoutException | javax.persistence.QueryTimeoutException | LockTimeoutException | - javax.persistence.LockTimeoutException e) { + catch (QueryTimeoutException | jakarta.persistence.QueryTimeoutException | LockTimeoutException | + jakarta.persistence.LockTimeoutException e) { if ( deadline == null ) { // ORM-initiated timeout: just propagate the exception. throw e; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/CriteriaTypeQueryFactory.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/CriteriaTypeQueryFactory.java index d5a10d24b0a..62d20f6fe74 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/CriteriaTypeQueryFactory.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/CriteriaTypeQueryFactory.java @@ -8,12 +8,12 @@ import java.util.Collection; import java.util.Set; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.MultiIdentifierLoadAccess; import org.hibernate.engine.spi.SessionImplementor; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmSelectionLoadingContext.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmSelectionLoadingContext.java index 61ca381e764..6cf6bb4a7d3 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmSelectionLoadingContext.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmSelectionLoadingContext.java @@ -10,7 +10,7 @@ import java.util.HashSet; import java.util.Optional; import java.util.Set; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.graph.GraphSemantic; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/LoadingMappingContext.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/LoadingMappingContext.java index f6d27fc95d7..bbb5a5c80a5 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/LoadingMappingContext.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/LoadingMappingContext.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.mapper.orm.loading.impl; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.search.mapper.orm.search.loading.EntityLoadingCacheLookupStrategy; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/SearchMapping.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/SearchMapping.java index e62e5d0486b..be45b64e68c 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/SearchMapping.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/SearchMapping.java @@ -8,8 +8,8 @@ import java.util.Collection; import java.util.Collections; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.Backend; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMapping.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMapping.java index d7579db7962..dd5225d240a 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMapping.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMapping.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/massindexing/impl/HibernateOrmMassIndexingMappingContext.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/massindexing/impl/HibernateOrmMassIndexingMappingContext.java index bae2fe090a5..9a83127f9ff 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/massindexing/impl/HibernateOrmMassIndexingMappingContext.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/massindexing/impl/HibernateOrmMassIndexingMappingContext.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.mapper.orm.massindexing.impl; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.search.engine.backend.common.spi.EntityReferenceFactory; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmPathInterpreter.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmPathInterpreter.java index 2de5760ee8b..1e581dd9de8 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmPathInterpreter.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmPathInterpreter.java @@ -153,7 +153,7 @@ * *

  • * Otherwise, no string representation can be assigned and an exception will be thrown. - * This includes in particular all cases when the path points to a {@link javax.persistence.Transient} property, + * This includes in particular all cases when the path points to a {@link jakarta.persistence.Transient} property, * or when a custom or {@link Optional} value extractor * is used before we can detect a prefix matching the conditions described above. *
    • diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/HibernateOrmScopeMappingContext.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/HibernateOrmScopeMappingContext.java index ff6f1cfb7d0..06ef03802f6 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/HibernateOrmScopeMappingContext.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/HibernateOrmScopeMappingContext.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.mapper.orm.scope.impl; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.search.engine.backend.mapping.spi.BackendMappingContext; import org.hibernate.search.mapper.orm.massindexing.impl.HibernateOrmMassIndexingMappingContext; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/dsl/SearchLoadingOptionsStep.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/dsl/SearchLoadingOptionsStep.java index 6a6d235236d..1333b986ac6 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/dsl/SearchLoadingOptionsStep.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/dsl/SearchLoadingOptionsStep.java @@ -8,7 +8,7 @@ import java.util.function.Consumer; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.graph.GraphSemantic; import org.hibernate.query.Query; @@ -61,7 +61,7 @@ public interface SearchLoadingOptionsStep { * @param graphName The name of the graph to apply. * @param semantic The semantic to use when applying the graph. * @return {@code this} for method chaining. - * @see javax.persistence.NamedEntityGraph + * @see jakarta.persistence.NamedEntityGraph */ SearchLoadingOptionsStep graph(String graphName, GraphSemantic semantic); diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java index fa528fb1b35..c8ca89a1e0a 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java @@ -15,11 +15,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.QueryTimeoutException; -import javax.persistence.TemporalType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.QueryTimeoutException; +import jakarta.persistence.TemporalType; import org.hibernate.HibernateException; import org.hibernate.LockMode; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/spi/HibernateOrmSearchScrollableResultsAdapter.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/spi/HibernateOrmSearchScrollableResultsAdapter.java index 29c1bce5dc8..069f97d0427 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/spi/HibernateOrmSearchScrollableResultsAdapter.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/spi/HibernateOrmSearchScrollableResultsAdapter.java @@ -16,7 +16,7 @@ import java.util.Locale; import java.util.TimeZone; -import javax.persistence.QueryTimeoutException; +import jakarta.persistence.QueryTimeoutException; import org.hibernate.ScrollableResults; import org.hibernate.query.spi.ScrollableResultsImplementor; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/SearchSession.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/SearchSession.java index 5bc4c9666cc..0f252e2be29 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/SearchSession.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/SearchSession.java @@ -10,8 +10,8 @@ import java.util.Collection; import java.util.Collections; -import javax.persistence.Entity; -import javax.persistence.EntityManager; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.search.engine.search.query.dsl.SearchQuerySelectStep; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/AfterCommitIndexingPlanSynchronization.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/AfterCommitIndexingPlanSynchronization.java index 3167c194a82..cd7f5114e09 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/AfterCommitIndexingPlanSynchronization.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/AfterCommitIndexingPlanSynchronization.java @@ -7,8 +7,8 @@ package org.hibernate.search.mapper.orm.session.impl; import java.lang.invoke.MethodHandles; -import javax.transaction.Status; -import javax.transaction.Synchronization; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; import org.hibernate.Transaction; import org.hibernate.search.mapper.orm.automaticindexing.session.impl.ConfiguredAutomaticIndexingSynchronizationStrategy; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/BeforeCommitIndexingPlanSynchronization.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/BeforeCommitIndexingPlanSynchronization.java index ed5f460cd22..6463ff6d68d 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/BeforeCommitIndexingPlanSynchronization.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/BeforeCommitIndexingPlanSynchronization.java @@ -7,8 +7,8 @@ package org.hibernate.search.mapper.orm.session.impl; import java.lang.invoke.MethodHandles; -import javax.transaction.Status; -import javax.transaction.Synchronization; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; import org.hibernate.Transaction; import org.hibernate.search.mapper.orm.automaticindexing.session.impl.ConfiguredAutomaticIndexingSynchronizationStrategy; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/ConfiguredAutomaticIndexingStrategy.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/ConfiguredAutomaticIndexingStrategy.java index 440f2f998d6..9824169a60c 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/ConfiguredAutomaticIndexingStrategy.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/ConfiguredAutomaticIndexingStrategy.java @@ -8,7 +8,7 @@ import java.lang.invoke.MethodHandles; import java.util.function.Function; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.Transaction; import org.hibernate.search.engine.cfg.ConfigurationPropertySource; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/DelegatingSearchSession.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/DelegatingSearchSession.java index 429a5342ffd..0544d4e724f 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/DelegatingSearchSession.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/DelegatingSearchSession.java @@ -9,7 +9,7 @@ import java.util.Collection; import java.util.function.Supplier; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSession.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSession.java index 9932bdc4e71..7cfd595cc94 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSession.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSession.java @@ -8,8 +8,8 @@ import java.lang.invoke.MethodHandles; import java.util.Collection; -import javax.persistence.EntityManager; -import javax.transaction.Synchronization; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Synchronization; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSessionHolder.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSessionHolder.java index 1743d064f38..6c5f8a21492 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSessionHolder.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSessionHolder.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.Transaction; import org.hibernate.engine.spi.SessionImplementor; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/SynchronizationAdapter.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/SynchronizationAdapter.java index 8b2f8031cd9..5883b3e06c4 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/SynchronizationAdapter.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/SynchronizationAdapter.java @@ -7,8 +7,8 @@ package org.hibernate.search.mapper.orm.session.impl; import java.lang.invoke.MethodHandles; -import javax.transaction.Status; -import javax.transaction.Synchronization; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; import org.hibernate.action.spi.AfterTransactionCompletionProcess; import org.hibernate.action.spi.BeforeTransactionCompletionProcess; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/spi/BatchMappingContext.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/spi/BatchMappingContext.java index aef7e79f7a6..ee3a91b7daa 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/spi/BatchMappingContext.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/spi/BatchMappingContext.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.mapper.orm.spi; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; public interface BatchMappingContext { diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/work/SearchIndexingPlan.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/work/SearchIndexingPlan.java index 618240b5c76..626be31b66b 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/work/SearchIndexingPlan.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/work/SearchIndexingPlan.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.mapper.orm.work; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * An interface for indexing entities in the context of an ORM Session. diff --git a/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBootstrapIntrospectorAccessTypeTest.java b/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBootstrapIntrospectorAccessTypeTest.java index 61aebae438a..b6f6c4ff420 100644 --- a/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBootstrapIntrospectorAccessTypeTest.java +++ b/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBootstrapIntrospectorAccessTypeTest.java @@ -11,18 +11,18 @@ import java.util.List; import java.util.Map; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyClass; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; import org.hibernate.search.mapper.pojo.model.spi.PojoRawTypeModel; import org.hibernate.search.util.common.reflect.spi.ValueReadHandle; diff --git a/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBootstrapIntrospectorAnnotationReadingTest.java b/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBootstrapIntrospectorAnnotationReadingTest.java index 83d5c0bf6e2..08d84f16330 100644 --- a/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBootstrapIntrospectorAnnotationReadingTest.java +++ b/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBootstrapIntrospectorAnnotationReadingTest.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.lang.annotation.Annotation; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.model.spi.PojoPropertyModel; diff --git a/pom.xml b/pom.xml index e9aa074bb15..55399709abc 100644 --- a/pom.xml +++ b/pom.xml @@ -282,8 +282,8 @@ 1.0.1 2.1.1 - 1.4.8.Final - 2.0.4.Final + 1.4.8.Final + 2.0.4.Final @@ -313,8 +313,8 @@ 3.12.0 3.6.1 1.11.1 - 3.1.9.Final - 4.0.3.Final + 3.1.9.Final + 4.0.3.Final 2.1.214 @@ -332,8 +332,8 @@ 1.36 - 1.0 - 2.1.1 + 1.0 + 2.1.1 2.1.1.Final @@ -730,7 +730,7 @@     org.hibernate.search - hibernate-search-util-internal-test-orm-jakarta + hibernate-search-util-internal-test-orm-javaee ${project.version} @@ -775,7 +775,7 @@ org.hibernate.search - hibernate-search-mapper-orm-jakarta + hibernate-search-mapper-orm-javaee ${project.version} @@ -795,7 +795,7 @@ org.hibernate.search - hibernate-search-v5migrationhelper-orm-jakarta + hibernate-search-v5migrationhelper-orm-javaee ${project.version} @@ -810,7 +810,7 @@ org.hibernate.search - hibernate-search-mapper-orm-batch-jsr352-core-jakarta + hibernate-search-mapper-orm-batch-jsr352-core-javaee ${project.version} @@ -825,7 +825,7 @@ org.hibernate.search - hibernate-search-mapper-orm-batch-jsr352-jberet-jakarta + hibernate-search-mapper-orm-batch-jsr352-jberet-javaee ${project.version} @@ -840,7 +840,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling-jakarta + hibernate-search-mapper-orm-coordination-outbox-polling-javaee ${project.version} @@ -1265,6 +1265,8 @@ + + org.hibernate hibernate-testing-jakarta @@ -1294,12 +1296,12 @@ com.ibm.jbatch com.ibm.jbatch-runtime - ${version.com.ibm.jbatch} + ${version.com.ibm.jbatch.javaee} com.ibm.jbatch com.ibm.jbatch.container - ${version.com.ibm.jbatch.jakarta} + ${version.com.ibm.jbatch} @@ -1325,6 +1327,37 @@ jberet-se ${version.org.jberet} + + + + org.glassfish.jaxb + jaxb-core + + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + + com.sun.activation + jakarta.activation + + + + + org.glassfish.jaxb + jaxb-runtime + + + + + com.sun.activation + jakarta.activation + + + @@ -2451,7 +2484,7 @@ dist - jakarta + javaee orm6 distribution diff --git a/util/internal/integrationtest/jbatch-runtime/pom.xml b/util/internal/integrationtest/jbatch-runtime/pom.xml index 8edf51c9862..ab06584ce02 100644 --- a/util/internal/integrationtest/jbatch-runtime/pom.xml +++ b/util/internal/integrationtest/jbatch-runtime/pom.xml @@ -21,17 +21,17 @@ com.ibm.jbatch - com.ibm.jbatch-runtime + com.ibm.jbatch.container compile - javax.batch - javax.batch-api + jakarta.batch + jakarta.batch-api compile - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api compile - ${version.javax.enterprise} + ${version.jakarta.enterprise} compile - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec + jakarta.transaction + jakarta.transaction-api - ${version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec} + ${version.jakarta.transaction-api} compile diff --git a/util/internal/integrationtest/mapper/orm/pom.xml b/util/internal/integrationtest/mapper/orm/pom.xml index 8b0509ae0e4..917c6fe12b0 100644 --- a/util/internal/integrationtest/mapper/orm/pom.xml +++ b/util/internal/integrationtest/mapper/orm/pom.xml @@ -43,11 +43,11 @@ org.hibernate - hibernate-core + hibernate-core-jakarta org.hibernate - hibernate-testing + hibernate-testing-jakarta diff --git a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/HibernateOrmMappingHandle.java b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/HibernateOrmMappingHandle.java index 91270ea69ab..3048179d274 100644 --- a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/HibernateOrmMappingHandle.java +++ b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/HibernateOrmMappingHandle.java @@ -8,7 +8,7 @@ import java.util.concurrent.CompletableFuture; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.mapping.impl.HibernateOrmMapping; diff --git a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/JPAPersistenceRunner.java b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/JPAPersistenceRunner.java index 0dc9d981893..7e923e784b7 100644 --- a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/JPAPersistenceRunner.java +++ b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/JPAPersistenceRunner.java @@ -8,9 +8,9 @@ import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.applyInJPATransaction; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; import org.hibernate.search.util.common.impl.Closer; import org.hibernate.search.util.impl.test.function.ThrowingBiFunction; diff --git a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/OrmUtils.java b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/OrmUtils.java index 88db6bbec2f..71c8644d770 100644 --- a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/OrmUtils.java +++ b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/OrmUtils.java @@ -7,9 +7,9 @@ package org.hibernate.search.util.impl.integrationtest.mapper.orm; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/PersistenceRunner.java b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/PersistenceRunner.java index 31a66f7e5b8..ef9b59b6e66 100644 --- a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/PersistenceRunner.java +++ b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/PersistenceRunner.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.util.impl.integrationtest.mapper.orm; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.hibernate.search.util.impl.test.function.ThrowingBiConsumer; import org.hibernate.search.util.impl.test.function.ThrowingBiFunction; diff --git a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/ReusableOrmSetupHolder.java b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/ReusableOrmSetupHolder.java index 8c82ebef212..0d3ea20d956 100644 --- a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/ReusableOrmSetupHolder.java +++ b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/ReusableOrmSetupHolder.java @@ -23,15 +23,15 @@ import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.EntityManagerFactory; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.Metamodel; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/SimpleEntityManagerFactoryBuilder.java b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/SimpleEntityManagerFactoryBuilder.java index 44e2035775d..9fff471e312 100644 --- a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/SimpleEntityManagerFactoryBuilder.java +++ b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/SimpleEntityManagerFactoryBuilder.java @@ -8,8 +8,8 @@ import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; public final class SimpleEntityManagerFactoryBuilder { diff --git a/util/internal/integrationtest/v5migrationhelper/pom.xml b/util/internal/integrationtest/v5migrationhelper/pom.xml index 25c2beda11a..5ed9e9d93d6 100644 --- a/util/internal/integrationtest/v5migrationhelper/pom.xml +++ b/util/internal/integrationtest/v5migrationhelper/pom.xml @@ -51,10 +51,10 @@ jsonassert - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec + jakarta.transaction + jakarta.transaction-api - ${version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec} + ${version.jakarta.transaction-api} diff --git a/util/internal/test/orm/pom.xml b/util/internal/test/orm/pom.xml index de35c69a48e..e958bd40c53 100644 --- a/util/internal/test/orm/pom.xml +++ b/util/internal/test/orm/pom.xml @@ -15,7 +15,7 @@ org.hibernate - hibernate-core + hibernate-core-jakarta org.hibernate.search diff --git a/v5migrationhelper/orm/src/main/java/org/hibernate/search/FullTextQuery.java b/v5migrationhelper/orm/src/main/java/org/hibernate/search/FullTextQuery.java index 7719bcaf301..93dac18997b 100644 --- a/v5migrationhelper/orm/src/main/java/org/hibernate/search/FullTextQuery.java +++ b/v5migrationhelper/orm/src/main/java/org/hibernate/search/FullTextQuery.java @@ -10,8 +10,8 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; import org.apache.lucene.search.Sort; diff --git a/v5migrationhelper/orm/src/main/java/org/hibernate/search/FullTextSharedSessionBuilder.java b/v5migrationhelper/orm/src/main/java/org/hibernate/search/FullTextSharedSessionBuilder.java index 67683a483a3..8d32aa98525 100644 --- a/v5migrationhelper/orm/src/main/java/org/hibernate/search/FullTextSharedSessionBuilder.java +++ b/v5migrationhelper/orm/src/main/java/org/hibernate/search/FullTextSharedSessionBuilder.java @@ -8,7 +8,7 @@ import java.sql.Connection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.ConnectionReleaseMode; import org.hibernate.Interceptor; diff --git a/v5migrationhelper/orm/src/main/java/org/hibernate/search/SearchFactory.java b/v5migrationhelper/orm/src/main/java/org/hibernate/search/SearchFactory.java index ec62958b355..4986057c512 100644 --- a/v5migrationhelper/orm/src/main/java/org/hibernate/search/SearchFactory.java +++ b/v5migrationhelper/orm/src/main/java/org/hibernate/search/SearchFactory.java @@ -32,7 +32,7 @@ * @author Hardy Ferentschik * @author Sanne Grinovero * @deprecated Instead of using Hibernate Search 5 APIs, get a {@link SearchMapping} - * using {@link org.hibernate.search.mapper.orm.Search#mapping(javax.persistence.EntityManagerFactory)}, + * using {@link org.hibernate.search.mapper.orm.Search#mapping(jakarta.persistence.EntityManagerFactory)}, * or {@link org.hibernate.search.mapper.orm.Search#mapping(SessionFactory)}. * See the individual methods for the replacement of each method. * Refer to the migration guide for more information. @@ -72,7 +72,7 @@ public interface SearchFactory { * * @throws org.hibernate.search.util.common.SearchException if the definition name is unknown * @deprecated Instead of using Hibernate Search 5 APIs, get a {@link SearchMapping} - * using {@link org.hibernate.search.mapper.orm.Search#mapping(javax.persistence.EntityManagerFactory)}, + * using {@link org.hibernate.search.mapper.orm.Search#mapping(jakarta.persistence.EntityManagerFactory)}, * or {@link org.hibernate.search.mapper.orm.Search#mapping(SessionFactory)}, * then get access to the backend using {@link SearchMapping#backend()}, * then convert it to a {@link LuceneBackend} using {@link Backend#unwrap(Class)}, @@ -92,7 +92,7 @@ public interface SearchFactory { * @throws java.lang.IllegalArgumentException in case {@code clazz == null} or the specified * class is not an indexed entity. * @deprecated Instead of using Hibernate Search 5 APIs, get a {@link SearchMapping} - * using {@link org.hibernate.search.mapper.orm.Search#mapping(javax.persistence.EntityManagerFactory)}, + * using {@link org.hibernate.search.mapper.orm.Search#mapping(jakarta.persistence.EntityManagerFactory)}, * or {@link org.hibernate.search.mapper.orm.Search#mapping(SessionFactory)}, * then get access to the entity metadata using {@link SearchMapping#indexedEntity(Class)}, * then get the corresponding index using {@link SearchIndexedEntity#indexManager()}, @@ -116,7 +116,7 @@ public interface SearchFactory { * * @return the set of currently indexed types. If no types are indexed the empty set is returned. * @deprecated Instead of using Hibernate Search 5 APIs, get a {@link SearchMapping} - * using {@link org.hibernate.search.mapper.orm.Search#mapping(javax.persistence.EntityManagerFactory)}, + * using {@link org.hibernate.search.mapper.orm.Search#mapping(jakarta.persistence.EntityManagerFactory)}, * or {@link org.hibernate.search.mapper.orm.Search#mapping(SessionFactory)}, * then get access to the entity metadata using {@link SearchMapping#allIndexedEntities()}. */ diff --git a/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/FullTextEntityManager.java b/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/FullTextEntityManager.java index 54e28a3cd9d..b2786cedb8e 100644 --- a/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/FullTextEntityManager.java +++ b/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/FullTextEntityManager.java @@ -8,7 +8,7 @@ import java.io.Serializable; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.query.Query; diff --git a/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/FullTextQuery.java b/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/FullTextQuery.java index 6af15cf5a7b..ba65ce77230 100644 --- a/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/FullTextQuery.java +++ b/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/FullTextQuery.java @@ -10,9 +10,9 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.Query; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.Sort; @@ -37,7 +37,7 @@ import org.hibernate.transform.ResultTransformer; /** - * The base interface for full-text queries using the JPA API ({@link javax.persistence.Query}). + * The base interface for full-text queries using the JPA API ({@link jakarta.persistence.Query}). * * @author Hardy Ferentschik * @author Emmanuel Bernard @@ -288,7 +288,7 @@ public interface FullTextQuery extends Query, ProjectionConstants { /** * Define a timeout period for a given unit of time. * Note that this is time out is on a best effort basis. - * When the query goes beyond the timeout, a {@link javax.persistence.QueryTimeoutException} is raised. + * When the query goes beyond the timeout, a {@link jakarta.persistence.QueryTimeoutException} is raised. * * @param timeout time out period * @param timeUnit time out unit diff --git a/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/Search.java b/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/Search.java index 92e6123a701..f61646e6196 100644 --- a/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/Search.java +++ b/v5migrationhelper/orm/src/main/java/org/hibernate/search/jpa/Search.java @@ -6,8 +6,8 @@ */ package org.hibernate.search.jpa; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceException; import org.hibernate.Session; import org.hibernate.search.util.common.SearchException; diff --git a/v5migrationhelper/orm/src/main/java/org/hibernate/search/query/hibernate/impl/FullTextQueryImpl.java b/v5migrationhelper/orm/src/main/java/org/hibernate/search/query/hibernate/impl/FullTextQueryImpl.java index 3f654d6327f..c6481cc62e7 100644 --- a/v5migrationhelper/orm/src/main/java/org/hibernate/search/query/hibernate/impl/FullTextQueryImpl.java +++ b/v5migrationhelper/orm/src/main/java/org/hibernate/search/query/hibernate/impl/FullTextQueryImpl.java @@ -17,11 +17,11 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.QueryTimeoutException; -import javax.persistence.TemporalType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.QueryTimeoutException; +import jakarta.persistence.TemporalType; import org.hibernate.HibernateException; import org.hibernate.LockMode; @@ -422,7 +422,7 @@ public FullTextQueryImpl setResultTransformer(ResultTransformer transformer) { * but we must implement it without generics (otherwise it won't compile). * * The actual reason is a bit hard to explain: basically we implement - * javax.persistence.Query as a raw type at some point, and our superclass + * jakarta.persistence.Query as a raw type at some point, and our superclass * (also extended as a raw type) also implements this interface, but as a non-raw type. * This seems to confuse the compiler, which thinks there are two different methods. */