HSEARCH-4940 Add relocation artifacts

Jenkinsfile

@@ -531,7 +531,7 @@ stage('Non-default environments') {
 					String mavenBuildAdditionalArgs = ''' \
 							-pl !documentation \
 							-pl !integrationtest/mapper/orm-spring \
-							-pl !integrationtest/mapper/orm-batch-jsr352 \
+							-pl !integrationtest/mapper/orm-jakarta-batch \
 							-pl !integrationtest/v5migrationhelper/orm \
 							-pl !integrationtest/java/modules/orm-lucene \
 							-pl !integrationtest/java/modules/orm-elasticsearch \

bom/public/pom.xml

@@ -74,12 +74,12 @@
             </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
-                <artifactId>hibernate-search-mapper-orm-batch-jsr352-core</artifactId>
+                <artifactId>hibernate-search-mapper-orm-jakarta-batch-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
-                <artifactId>hibernate-search-mapper-orm-batch-jsr352-jberet</artifactId>
+                <artifactId>hibernate-search-mapper-orm-jakarta-batch-jberet</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

build/jqassistant/rules/rules.xml

@@ -280,7 +280,7 @@
                         WHEN 'hibernate-search-mapper-pojo-standalone' THEN 'StandalonePojo'
                         WHEN 'hibernate-search-mapper-orm' THEN 'HibernateOrm'
                         WHEN 'hibernate-search-mapper-orm-coordination-outbox-polling' THEN 'OutboxPolling'
-                        WHEN 'hibernate-search-mapper-orm-batch-jsr352-jberet' THEN 'JBeret'
+                        WHEN 'hibernate-search-mapper-orm-jakarta-batch-jberet' THEN 'JBeret'
                         ELSE 'UNKNOWN-MODULE-SPECIFIC-KEYWORD-PLEASE-UPDATE-JQASSISTANT-RULES'
                     END
             RETURN

build/parents/build/pom.xml

@@ -103,7 +103,7 @@
         -->
         <version.jakarta.persistence>3.1.0</version.jakarta.persistence>
 
-        <!-- >>> JSR 352 -->
+        <!-- >>> Jakarta Batch -->
         <version.jakarta.batch>2.1.1</version.jakarta.batch>
         <version.org.jberet>2.1.2.Final</version.org.jberet>
 
@@ -145,10 +145,10 @@
         <!-- >>> Performance tests -->
         <version.org.openjdk.jmh>1.37</version.org.openjdk.jmh>
 
-        <!-- >>> JSR 352: JBatch runtime -->
+        <!-- >>> Jakarta Batch: JBatch runtime -->
         <version.com.ibm.jbatch>2.1.1</version.com.ibm.jbatch>
 
-        <!-- >>> JSR 352: JBeret SE dependencies -->
+        <!-- >>> Jakarta Batch: JBeret SE dependencies -->
         <version.org.jboss.marshalling>2.1.2.Final</version.org.jboss.marshalling>
         <version.org.wildfly.security.wildfly-security-manager>1.1.2.Final</version.org.wildfly.security.wildfly-security-manager>
         <version.org.google.guava>32.1.2-jre</version.org.google.guava>
@@ -313,19 +313,31 @@
             </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
-                <artifactId>hibernate-search-mapper-orm-batch-jsr352-core</artifactId>
+                <artifactId>hibernate-search-mapper-orm-jakarta-batch-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
-                <artifactId>hibernate-search-mapper-orm-batch-jsr352-jberet</artifactId>
+                <artifactId>hibernate-search-mapper-orm-jakarta-batch-jberet</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
                 <artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate.search</groupId>
+                <artifactId>hibernate-search-mapper-orm-batch-jsr352-core</artifactId>
+                <type>pom</type>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate.search</groupId>
+                <artifactId>hibernate-search-mapper-orm-batch-jsr352-jberet</artifactId>
+                <type>pom</type>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- Remaining Hibernate Search dependencies -->
             <dependency>
@@ -442,7 +454,7 @@
                 <scope>provided</scope>
             </dependency>
 
-            <!-- JBeret used by batch-jsr352 jberet module -->
+            <!-- JBeret used by Jakarta Batch JBeret module -->
             <dependency>
                 <groupId>org.jberet</groupId>
                 <artifactId>jberet-core</artifactId>
@@ -621,7 +633,7 @@
             </dependency>
             <dependency>
                 <groupId>org.hibernate.search</groupId>
-                <artifactId>hibernate-search-integrationtest-mapper-orm-batch-jsr352</artifactId>
+                <artifactId>hibernate-search-integrationtest-mapper-orm-jakarta-batch</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

build/parents/public/pom.xml

@@ -93,7 +93,7 @@
                                 <url>${javadoc.org.apache.lucene.queryparser.url}</url>
                                 <location>${javadoc.packagelists.directory}/lucene-queryparser</location>
                             </offlineLink>
-                            <!-- For jakarta.batch in the JSR 352 modules -->
+                            <!-- For jakarta.batch in the Jakarta Batch modules -->
                             <offlineLink>
                                 <url>${javadoc.jakarta.batch.url}</url>
                                 <location>${javadoc.packagelists.directory}/batch-api</location>

build/reports/pom.xml

@@ -70,13 +70,23 @@
             <groupId>org.hibernate.search</groupId>
             <artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-mapper-orm-jakarta-batch-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-mapper-orm-jakarta-batch-jberet</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.hibernate.search</groupId>
             <artifactId>hibernate-search-mapper-orm-batch-jsr352-core</artifactId>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.hibernate.search</groupId>
             <artifactId>hibernate-search-mapper-orm-batch-jsr352-jberet</artifactId>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.hibernate.search</groupId>
@@ -135,7 +145,7 @@
         </dependency>
         <dependency>
             <groupId>org.hibernate.search</groupId>
-            <artifactId>hibernate-search-integrationtest-mapper-orm-batch-jsr352</artifactId>
+            <artifactId>hibernate-search-integrationtest-mapper-orm-jakarta-batch</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

distribution/pom.xml

@@ -24,7 +24,7 @@
     <properties>
         <!--
             Any javadoc warnings should've been caught already while the previous modules were built.
-            Also see additional explanations on this property in the `hibernate-search-mapper-orm-batch-jsr352-core` module.
+            Also see additional explanations on this property in the `hibernate-search-mapper-orm-jakarta-batch-core` module.
         -->
         <failOnJavadocWarning>false</failOnJavadocWarning>
         <!--
@@ -104,12 +104,12 @@
         </dependency>
         <dependency>
             <groupId>org.hibernate.search</groupId>
-            <artifactId>hibernate-search-mapper-orm-batch-jsr352-core</artifactId>
+            <artifactId>hibernate-search-mapper-orm-jakarta-batch-core</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate.search</groupId>
-            <artifactId>hibernate-search-mapper-orm-batch-jsr352-jberet</artifactId>
+            <artifactId>hibernate-search-mapper-orm-jakarta-batch-jberet</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -172,7 +172,7 @@
                                 ${basedir}/../backend/lucene/src/main/java;
                                 ${basedir}/../mapper/lucene/src/main/java;
                                 ${basedir}/../mapper/orm-coordination-outbox-polling/src/main/java;
-                                ${basedir}/../mapper/orm-batch-jsr352/core/src/main/java;
+                                ${basedir}/../mapper/orm-jakarta-batch/core/src/main/java;
                             </sourcepath>
                             <docfilessubdirs>true</docfilessubdirs>
                             <packagesheader>Hibernate Search Packages</packagesheader>

distribution/src/main/assembly/dist.xml

@@ -118,25 +118,25 @@
             </includes>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>dist/mapper/orm/batch-jsr352/core</outputDirectory>
+            <outputDirectory>dist/mapper/orm/jakarta-batch/core</outputDirectory>
             <scope>runtime</scope>
             <useProjectArtifact>false</useProjectArtifact>
             <useTransitiveDependencies>true</useTransitiveDependencies>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.hibernate.search:hibernate-search-mapper-orm-batch-jsr352-core</include>
+                <include>org.hibernate.search:hibernate-search-mapper-orm-jakarta-batch-core</include>
             </includes>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>dist/mapper/orm/batch-jsr352/jberet</outputDirectory>
+            <outputDirectory>dist/mapper/orm/jakarta-batch/jberet</outputDirectory>
             <scope>runtime</scope>
             <useProjectArtifact>false</useProjectArtifact>
             <useTransitiveDependencies>true</useTransitiveDependencies>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.hibernate.search:hibernate-search-mapper-orm-batch-jsr352-jberet</include>
+                <include>org.hibernate.search:hibernate-search-mapper-orm-jakarta-batch-jberet</include>
             </includes>
         </dependencySet>
         <dependencySet>

documentation/pom.xml

@@ -91,7 +91,7 @@
         <!-- Jakarta Batch integration -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>hibernate-search-mapper-orm-batch-jsr352-core</artifactId>
+            <artifactId>hibernate-search-mapper-orm-jakarta-batch-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

documentation/src/main/asciidoc/public/reference/_mapper-orm-indexing-jakarta-batch.adoc

@@ -22,7 +22,7 @@ If the runtime is JBeret, you need to add the following dependency:
 ----
 <dependency>
    <groupId>org.hibernate.search</groupId>
-   <artifactId>hibernate-search-mapper-orm-batch-jsr352-jberet</artifactId>
+   <artifactId>hibernate-search-mapper-orm-jakarta-batch-jberet</artifactId>
    <version>{hibernateSearchVersion}</version>
 </dependency>
 ----
@@ -33,7 +33,7 @@ For any other runtime, you need to add the following dependency:
 ----
 <dependency>
    <groupId>org.hibernate.search</groupId>
-   <artifactId>hibernate-search-mapper-orm-batch-jsr352-core</artifactId>
+   <artifactId>hibernate-search-mapper-orm-jakarta-batch-core</artifactId>
    <version>{hibernateSearchVersion}</version>
 </dependency>
 ----
@@ -58,7 +58,7 @@ include::{sourcedir}/org/hibernate/search/documentation/mapper/orm/indexing/Hibe
 The following table contains all the job parameters you can use to customize the mass-indexing job.
 
 [cols="2,1,3a",options="header"]
-.Job Parameters in JSR 352 Integration
+.Job Parameters in Jakarta Batch Integration
 |===
 |Parameter Name / Builder Method |Default value |Description
 
@@ -414,7 +414,7 @@ to the relevant scope in the dependency injection mechanism:
  * `org.hibernate.search.batch.jsr352.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-batch-jsr352-core` module in the dependency injection context.
+`hibernate-search-mapper-orm-jakarta-batch-core` module in the dependency injection context.
 For instance this can be achieved in Spring DI using the `@ComponentScan` annotation.
 3. You must register a single bean in the dependency injection context
 that will implement the `EntityManagerFactoryRegistry` interface.

integrationtest/mapper/orm-batch-jsr352/pom.xml → integrationtest/mapper/orm-jakarta-batch/pom.xml

@@ -7,7 +7,7 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
-    <artifactId>hibernate-search-integrationtest-mapper-orm-batch-jsr352</artifactId>
+    <artifactId>hibernate-search-integrationtest-mapper-orm-jakarta-batch</artifactId>
 
     <name>Hibernate Search ITs - ORM - Jakarta Batch</name>
     <description>Hibernate Search integration tests for the Jakarta Batch integration</description>
@@ -25,12 +25,12 @@
     <dependencies>
         <dependency>
             <groupId>org.hibernate.search</groupId>
-            <artifactId>hibernate-search-mapper-orm-batch-jsr352-core</artifactId>
+            <artifactId>hibernate-search-mapper-orm-jakarta-batch-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate.search</groupId>
-            <artifactId>hibernate-search-mapper-orm-batch-jsr352-jberet</artifactId>
+            <artifactId>hibernate-search-mapper-orm-jakarta-batch-jberet</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -104,7 +104,7 @@
                             </classpathDependencyExcludes>
                             <systemPropertyVariables>
                                 <org.hibernate.search.integrationtest.backend.type>lucene</org.hibernate.search.integrationtest.backend.type>
-                                <org.hibernate.search.integrationtest.jsr352.type>jbatch</org.hibernate.search.integrationtest.jsr352.type>
+                                <org.hibernate.search.integrationtest.jakarta.batch.type>jbatch</org.hibernate.search.integrationtest.jakarta.batch.type>
                             </systemPropertyVariables>
                         </configuration>
                     </execution>
@@ -122,7 +122,7 @@
                             </classpathDependencyExcludes>
                             <systemPropertyVariables>
                                 <org.hibernate.search.integrationtest.backend.type>lucene</org.hibernate.search.integrationtest.backend.type>
-                                <org.hibernate.search.integrationtest.jsr352.type>jberet</org.hibernate.search.integrationtest.jsr352.type>
+                                <org.hibernate.search.integrationtest.jakarta.batch.type>jberet</org.hibernate.search.integrationtest.jakarta.batch.type>
                             </systemPropertyVariables>
                         </configuration>
                     </execution>
@@ -142,7 +142,7 @@
                             </classpathDependencyExcludes>
                             <systemPropertyVariables>
                                 <org.hibernate.search.integrationtest.backend.type>elasticsearch</org.hibernate.search.integrationtest.backend.type>
-                                <org.hibernate.search.integrationtest.jsr352.type>jbatch</org.hibernate.search.integrationtest.jsr352.type>
+                                <org.hibernate.search.integrationtest.jakarta.batch.type>jbatch</org.hibernate.search.integrationtest.jakarta.batch.type>
                             </systemPropertyVariables>
                         </configuration>
                     </execution>
@@ -161,7 +161,7 @@
                             </classpathDependencyExcludes>
                             <systemPropertyVariables>
                                 <org.hibernate.search.integrationtest.backend.type>elasticsearch</org.hibernate.search.integrationtest.backend.type>
-                                <org.hibernate.search.integrationtest.jsr352.type>jberet</org.hibernate.search.integrationtest.jsr352.type>
+                                <org.hibernate.search.integrationtest.jakarta.batch.type>jberet</org.hibernate.search.integrationtest.jakarta.batch.type>
                             </systemPropertyVariables>
                         </configuration>
                     </execution>

integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/util/JobTestUtil.java → integrationtest/mapper/orm-jakarta-batch/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/util/JobTestUtil.java

@@ -39,18 +39,18 @@ public final class JobTestUtil {
 	public static final int JOB_TIMEOUT_MS = 30_000;
 
 	private static final int THREAD_SLEEP_MS = 100;
-	private static final String JSR325_TYPE_FOR_IDE_TESTS = "jbatch";
+	private static final String JAKARTA_BATCH_TYPE_FOR_IDE_TESTS = "jbatch";
 
 	private JobTestUtil() {
 	}
 
 	public static JobOperator getAndCheckRuntime() {
 		JobOperator operator = BatchRuntime.getJobOperator();
-		String expectedType = System.getProperty( "org.hibernate.search.integrationtest.jsr352.type" );
+		String expectedType = System.getProperty( "org.hibernate.search.integrationtest.jakarta.batch.type" );
 
 		// only for tests run from the IDE only
 		if ( expectedType == null ) {
-			expectedType = JSR325_TYPE_FOR_IDE_TESTS;
+			expectedType = JAKARTA_BATCH_TYPE_FOR_IDE_TESTS;
 		}
 
 		assertThat( operator ).extracting( Object::getClass ).asString()

integrationtest/pom.xml

@@ -24,7 +24,7 @@
         <module>mapper/orm-envers</module>
         <module>mapper/orm-realbackend</module>
         <module>mapper/orm-coordination-outbox-polling</module>
-        <module>mapper/orm-batch-jsr352</module>
+        <module>mapper/orm-jakarta-batch</module>
         <module>performance</module>
         <module>v5migrationhelper/engine</module>
         <module>v5migrationhelper/orm</module>