HSEARCH-4940 Change module/package names

hibernate · Sep 22, 2023 · 4f86ac6 · 4f86ac6
1 parent 794c022
commit 4f86ac6
Show file tree

Hide file tree

Showing 65 changed files with 430 additions and 449 deletions.
diff --git a/...tion/src/main/asciidoc/public/reference/_mapper-orm-indexing-jakarta-batch.adoc b/...tion/src/main/asciidoc/public/reference/_mapper-orm-indexing-jakarta-batch.adoc
@@ -410,8 +410,8 @@ If you want to use a different Jakarta Batch implementation that happens to allo
 
 1. You must map the following two scope annotations
 to the relevant scope in the dependency injection mechanism:
- * `org.hibernate.search.batch.jsr352.core.inject.scope.spi.HibernateSearchJobScoped`
- * `org.hibernate.search.batch.jsr352.core.inject.scope.spi.HibernateSearchPartitionScoped`
+ * `org.hibernate.search.jakarta.batch.core.inject.scope.spi.HibernateSearchJobScoped`
+ * `org.hibernate.search.jakarta.batch.core.inject.scope.spi.HibernateSearchPartitionScoped`
 2. You must make sure that the dependency injection mechanism will register
 all injection-annotated classes (`@Named`, ...) from the
 `hibernate-search-mapper-orm-jakarta-batch-core` module in the dependency injection context.

diff --git a/...va/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmJakartaBatchIT.java b/...va/org/hibernate/search/documentation/mapper/orm/indexing/HibernateOrmJakartaBatchIT.java
@@ -19,8 +19,8 @@
 import jakarta.persistence.EntityManager;
 
 import org.hibernate.SessionFactory;
-import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob;
 import org.hibernate.search.documentation.testsupport.BackendConfigurations;
+import org.hibernate.search.jakarta.batch.core.massindexing.MassIndexingJob;
 import org.hibernate.search.mapper.orm.Search;
 import org.hibernate.search.mapper.orm.session.SearchSession;
 

diff --git a/...52/component/EntityReaderComponentIT.java → ...ch/component/EntityReaderComponentIT.java b/...52/component/EntityReaderComponentIT.java → ...ch/component/EntityReaderComponentIT.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.component;
+package org.hibernate.search.integrationtest.jakarta.batch.component;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -20,12 +20,12 @@
 import jakarta.persistence.EntityManagerFactory;
 
 import org.hibernate.CacheMode;
-import org.hibernate.search.batch.jsr352.core.massindexing.impl.JobContextData;
-import org.hibernate.search.batch.jsr352.core.massindexing.step.impl.IndexScope;
-import org.hibernate.search.batch.jsr352.core.massindexing.step.spi.EntityReader;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
-import org.hibernate.search.integrationtest.batch.jsr352.util.BackendConfigurations;
-import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Company;
+import org.hibernate.search.integrationtest.jakarta.batch.util.BackendConfigurations;
+import org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil;
+import org.hibernate.search.jakarta.batch.core.massindexing.impl.JobContextData;
+import org.hibernate.search.jakarta.batch.core.massindexing.step.impl.IndexScope;
+import org.hibernate.search.jakarta.batch.core.massindexing.step.spi.EntityReader;
 import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.ReusableOrmSetupHolder;

diff --git a/...nateSearchPartitionMapperComponentIT.java → ...nateSearchPartitionMapperComponentIT.java b/...nateSearchPartitionMapperComponentIT.java → ...nateSearchPartitionMapperComponentIT.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.component;
+package org.hibernate.search.integrationtest.jakarta.batch.component;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -18,14 +18,14 @@
 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;
-import org.hibernate.search.batch.jsr352.core.massindexing.util.impl.MassIndexingPartitionProperties;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Person;
-import org.hibernate.search.integrationtest.batch.jsr352.util.BackendConfigurations;
-import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
-import org.hibernate.search.integrationtest.batch.jsr352.util.PersistenceUnitTestUtil;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Company;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Person;
+import org.hibernate.search.integrationtest.jakarta.batch.util.BackendConfigurations;
+import org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil;
+import org.hibernate.search.integrationtest.jakarta.batch.util.PersistenceUnitTestUtil;
+import org.hibernate.search.jakarta.batch.core.massindexing.impl.JobContextData;
+import org.hibernate.search.jakarta.batch.core.massindexing.step.impl.HibernateSearchPartitionMapper;
+import org.hibernate.search.jakarta.batch.core.massindexing.util.impl.MassIndexingPartitionProperties;
 import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.ReusableOrmSetupHolder;

diff --git a/.../component/ValidationUtilComponentIT.java → .../component/ValidationUtilComponentIT.java b/.../component/ValidationUtilComponentIT.java → .../component/ValidationUtilComponentIT.java
@@ -4,17 +4,17 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.component;
+package org.hibernate.search.integrationtest.jakarta.batch.component;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.hibernate.search.batch.jsr352.core.massindexing.util.impl.ValidationUtil;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Person;
-import org.hibernate.search.integrationtest.batch.jsr352.util.BackendConfigurations;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Company;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Person;
+import org.hibernate.search.integrationtest.jakarta.batch.util.BackendConfigurations;
+import org.hibernate.search.jakarta.batch.core.massindexing.util.impl.ValidationUtil;
 import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
 import org.hibernate.search.util.common.SearchException;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;

diff --git a/...r352/massindexing/BatchIndexingJobIT.java → ...atch/massindexing/BatchIndexingJobIT.java b/...r352/massindexing/BatchIndexingJobIT.java → ...atch/massindexing/BatchIndexingJobIT.java
@@ -4,11 +4,11 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.massindexing;
+package org.hibernate.search.integrationtest.jakarta.batch.massindexing;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
-import static org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil.JOB_TIMEOUT_MS;
+import static org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil.JOB_TIMEOUT_MS;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -27,15 +27,15 @@
 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;
-import org.hibernate.search.batch.jsr352.core.massindexing.step.impl.StepProgress;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.CompanyGroup;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Person;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.WhoAmI;
-import org.hibernate.search.integrationtest.batch.jsr352.util.BackendConfigurations;
-import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Company;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.CompanyGroup;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Person;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.WhoAmI;
+import org.hibernate.search.integrationtest.jakarta.batch.util.BackendConfigurations;
+import org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil;
+import org.hibernate.search.jakarta.batch.core.logging.impl.Log;
+import org.hibernate.search.jakarta.batch.core.massindexing.MassIndexingJob;
+import org.hibernate.search.jakarta.batch.core.massindexing.step.impl.StepProgress;
 import org.hibernate.search.mapper.orm.Search;
 import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
 import org.hibernate.search.mapper.orm.session.SearchSession;

diff --git a/...xing/EntityManagerFactoryRetrievalIT.java → ...xing/EntityManagerFactoryRetrievalIT.java b/...xing/EntityManagerFactoryRetrievalIT.java → ...xing/EntityManagerFactoryRetrievalIT.java
@@ -4,9 +4,9 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.massindexing;
+package org.hibernate.search.integrationtest.jakarta.batch.massindexing;
 
-import static org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil.JOB_TIMEOUT_MS;
+import static org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil.JOB_TIMEOUT_MS;
 import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with;
 import static org.junit.Assert.assertEquals;
 
@@ -18,12 +18,12 @@
 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.Company;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Person;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.WhoAmI;
-import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
-import org.hibernate.search.integrationtest.batch.jsr352.util.PersistenceUnitTestUtil;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Company;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Person;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.WhoAmI;
+import org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil;
+import org.hibernate.search.integrationtest.jakarta.batch.util.PersistenceUnitTestUtil;
+import org.hibernate.search.jakarta.batch.core.massindexing.MassIndexingJob;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/...ing/MassIndexingJobWithCompositeIdIT.java → ...ing/MassIndexingJobWithCompositeIdIT.java b/...ing/MassIndexingJobWithCompositeIdIT.java → ...ing/MassIndexingJobWithCompositeIdIT.java
@@ -4,10 +4,10 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.massindexing;
+package org.hibernate.search.integrationtest.jakarta.batch.massindexing;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil.JOB_TIMEOUT_MS;
+import static org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil.JOB_TIMEOUT_MS;
 import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with;
 
 import java.io.Serializable;
@@ -26,9 +26,9 @@
 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;
-import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
+import org.hibernate.search.integrationtest.jakarta.batch.util.BackendConfigurations;
+import org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil;
+import org.hibernate.search.jakarta.batch.core.massindexing.MassIndexingJob;
 import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
 import org.hibernate.search.mapper.pojo.bridge.IdentifierBridge;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.IdentifierBridgeRef;

diff --git a/...ng/MassIndexingJobWithMultiTenancyIT.java → ...ng/MassIndexingJobWithMultiTenancyIT.java b/...ng/MassIndexingJobWithMultiTenancyIT.java → ...ng/MassIndexingJobWithMultiTenancyIT.java
@@ -4,11 +4,11 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.massindexing;
+package org.hibernate.search.integrationtest.jakarta.batch.massindexing;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil.JOB_TIMEOUT_MS;
-import static org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil.findIndexedResultsInTenant;
+import static org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil.JOB_TIMEOUT_MS;
+import static org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil.findIndexedResultsInTenant;
 
 import java.util.Arrays;
 import java.util.List;
@@ -18,10 +18,10 @@
 import jakarta.batch.runtime.JobExecution;
 
 import org.hibernate.SessionFactory;
-import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob;
-import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
-import org.hibernate.search.integrationtest.batch.jsr352.util.BackendConfigurations;
-import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
+import org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Company;
+import org.hibernate.search.integrationtest.jakarta.batch.util.BackendConfigurations;
+import org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil;
+import org.hibernate.search.jakarta.batch.core.massindexing.MassIndexingJob;
 import org.hibernate.search.mapper.orm.Search;
 import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;

diff --git a/...h/jsr352/massindexing/RestartChunkIT.java → ...ta/batch/massindexing/RestartChunkIT.java b/...h/jsr352/massindexing/RestartChunkIT.java → ...ta/batch/massindexing/RestartChunkIT.java
@@ -4,9 +4,9 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.massindexing;
+package org.hibernate.search.integrationtest.jakarta.batch.massindexing;
 
-import static org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil.JOB_TIMEOUT_MS;
+import static org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil.JOB_TIMEOUT_MS;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -24,10 +24,10 @@
 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;
-import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
-import org.hibernate.search.integrationtest.batch.jsr352.util.SimulatedFailure;
+import org.hibernate.search.integrationtest.jakarta.batch.util.BackendConfigurations;
+import org.hibernate.search.integrationtest.jakarta.batch.util.JobTestUtil;
+import org.hibernate.search.integrationtest.jakarta.batch.util.SimulatedFailure;
+import org.hibernate.search.jakarta.batch.core.massindexing.MassIndexingJob;
 import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;

diff --git a/...h/jsr352/massindexing/entity/Company.java → ...ta/batch/massindexing/entity/Company.java b/...h/jsr352/massindexing/entity/Company.java → ...ta/batch/massindexing/entity/Company.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity;
+package org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity;
 
 import java.io.Serializable;
 

diff --git a/...352/massindexing/entity/CompanyGroup.java → ...tch/massindexing/entity/CompanyGroup.java b/...352/massindexing/entity/CompanyGroup.java → ...tch/massindexing/entity/CompanyGroup.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity;
+package org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...ch/jsr352/massindexing/entity/Person.java → ...rta/batch/massindexing/entity/Person.java b/...ch/jsr352/massindexing/entity/Person.java → ...rta/batch/massindexing/entity/Person.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity;
+package org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;

diff --git a/...ch/jsr352/massindexing/entity/WhoAmI.java → ...rta/batch/massindexing/entity/WhoAmI.java b/...ch/jsr352/massindexing/entity/WhoAmI.java → ...rta/batch/massindexing/entity/WhoAmI.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity;
+package org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;

diff --git a/...ch/jsr352/util/BackendConfigurations.java → ...rta/batch/util/BackendConfigurations.java b/...ch/jsr352/util/BackendConfigurations.java → ...rta/batch/util/BackendConfigurations.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.util;
+package org.hibernate.search.integrationtest.jakarta.batch.util;
 
 import static org.hibernate.search.util.impl.integrationtest.common.rule.BackendConfiguration.BACKEND_TYPE;
 

diff --git a/...ontest/batch/jsr352/util/JobTestUtil.java → ...ntest/jakarta/batch/util/JobTestUtil.java b/...ontest/batch/jsr352/util/JobTestUtil.java → ...ntest/jakarta/batch/util/JobTestUtil.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.util;
+package org.hibernate.search.integrationtest.jakarta.batch.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,9 +22,9 @@
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.search.batch.jsr352.core.logging.impl.Log;
-import org.hibernate.search.batch.jsr352.core.massindexing.util.impl.EntityTypeDescriptor;
-import org.hibernate.search.batch.jsr352.core.massindexing.util.impl.SingularIdOrder;
+import org.hibernate.search.jakarta.batch.core.logging.impl.Log;
+import org.hibernate.search.jakarta.batch.core.massindexing.util.impl.EntityTypeDescriptor;
+import org.hibernate.search.jakarta.batch.core.massindexing.util.impl.SingularIdOrder;
 import org.hibernate.search.mapper.orm.Search;
 import org.hibernate.search.mapper.orm.session.SearchSession;
 import org.hibernate.search.util.common.logging.impl.LoggerFactory;

diff --git a/.../jsr352/util/PersistenceUnitTestUtil.java → ...a/batch/util/PersistenceUnitTestUtil.java b/.../jsr352/util/PersistenceUnitTestUtil.java → ...a/batch/util/PersistenceUnitTestUtil.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.util;
+package org.hibernate.search.integrationtest.jakarta.batch.util;
 
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendConfiguration;
 

diff --git a/...t/batch/jsr352/util/SimulatedFailure.java → .../jakarta/batch/util/SimulatedFailure.java b/...t/batch/jsr352/util/SimulatedFailure.java → .../jakarta/batch/util/SimulatedFailure.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.batch.jsr352.util;
+package org.hibernate.search.integrationtest.jakarta.batch.util;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;