HSEARCH-4394 Move main code from Java EE to Jakarta EE

hibernate · Jan 2, 2023 · 8a64a2a · 8a64a2a
1 parent c900d0d
commit 8a64a2a
Show file tree

Hide file tree

Showing 822 changed files with 3,099 additions and 3,084 deletions.
diff --git a/build/config/pom.xml b/build/config/pom.xml
@@ -69,7 +69,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.hibernate</groupId>
-                                    <artifactId>hibernate-core</artifactId>
+                                    <artifactId>hibernate-core-jakarta</artifactId>
                                     <classifier>javadoc</classifier>
                                     <type>jar</type>
                                     <version>${version.org.hibernate}</version>
@@ -100,8 +100,8 @@
                                     <outputDirectory>${tmpdir.dependencies-javadoc-packagelists}/lucene-queryparser</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>javax.batch</groupId>
-                                    <artifactId>javax.batch-api</artifactId>
+                                    <groupId>jakarta.batch</groupId>
+                                    <artifactId>jakarta.batch-api</artifactId>
                                     <classifier>javadoc</classifier>
                                     <type>jar</type>
                                     <version>${version.javax.batch}</version>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -103,34 +103,34 @@
             <type>pom</type>
         </dependency>
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <!-- DO NOT REMOVE and DO NOT MANAGE the version of this dependency. See the version property declaration. -->
-            <version>${version.javax.persistence}</version>
+            <version>${version.jakarta.persistence}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.spec.javax.transaction</groupId>
-            <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
             <!-- DO NOT REMOVE and DO NOT MANAGE the version of this dependency. See the version property declaration. -->
-            <version>${version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec}</version>
+            <version>${version.jakarta.transaction-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.batch</groupId>
-            <artifactId>javax.batch-api</artifactId>
+            <groupId>jakarta.batch</groupId>
+            <artifactId>jakarta.batch-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <!-- DO NOT REMOVE and DO NOT MANAGE the version of this dependency. See the version property declaration. -->
-            <version>${version.javax.enterprise}</version>
+            <version>${version.jakarta.enterprise}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/distribution/src/main/assembly/dist.xml b/distribution/src/main/assembly/dist.xml
@@ -145,11 +145,11 @@
             <useProjectArtifact>false</useProjectArtifact>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>javax.persistence:javax.persistence-api</include>
-                <include>org.jboss.spec.javax.transaction:*</include>
-                <include>javax.batch:javax.batch-api</include>
-                <include>javax.inject:javax.inject</include>
-                <include>javax.enterprise:cdi-api</include>
+                <include>jakarta.persistence:jakarta.persistence-api</include>
+                <include>jakarta.transaction:jakarta.transaction-api</include>
+                <include>jakarta.batch:jakarta.batch-api</include>
+                <include>jakarta.inject:jakarta.inject-api</include>
+                <include>jakarta.enterprise:jakarta.enterprise.cdi-api</include>
             </includes>
         </dependencySet>
     </dependencySets>

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -316,6 +316,7 @@
                         <hibernateBlogUrl>https://in.relation.to/</hibernateBlogUrl>
                         <hibernateVersion>${version.org.hibernate}</hibernateVersion>
                         <hibernateDocUrl>${documentation.org.hibernate.url}</hibernateDocUrl>
+                        <javaeeUrl>https://www.oracle.com/java/technologies/java-ee-glance.html</javaeeUrl>
                         <jpaVersion>${parsed-version.javax.persistence.majorVersion}.${parsed-version.javax.persistence.minorVersion}</jpaVersion>
                         <hibernateOrm6DocUrl>${documentation.org.hibernate.orm.url}</hibernateOrm6DocUrl>
                         <hibernateOrm6Version>${version.org.hibernate.orm}</hibernateOrm6Version>

diff --git a/documentation/src/main/asciidoc/reference/compatibility.asciidoc b/documentation/src/main/asciidoc/reference/compatibility.asciidoc
@@ -14,12 +14,12 @@
 |Hibernate ORM (for the <<mapper-orm,Hibernate ORM mapper>>
 |{hibernateVersion}
 |
-|JPA (Java EE) (for the <<mapper-orm,Hibernate ORM mapper>>
-|{jpaVersion}
-|
-|Jakarta Persistence (for the <<mapper-orm,Hibernate ORM mapper>>
+|Jakarta Persistence (for the ORM mapper)
 |{jakartaPersistenceVersion}
-|Need to use <<other-integrations-jakarta,different Maven artifacts>>.
+|
+|JPA (Java EE) (for the ORM mapper)
+|{jpaVersion}
+|Need to use <<other-integrations-javaee,different Maven artifacts>>.
 |Apache Lucene (for the <<backend-lucene,Lucene backend>>)
 |{luceneVersion}
 |

diff --git 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:
 ----
 <dependency>
    <groupId>org.hibernate</groupId>
-   <artifactId>hibernate-core-jakarta</artifactId> <!--1-->
+   <artifactId>hibernate-core-javaee</artifactId> <!--1-->
    <version>{hibernateVersion}</version>
 </dependency>
 <dependency>
    <groupId>org.hibernate.search</groupId>
-   <artifactId></artifactId>
-   <artifactId>hibernate-search-mapper-orm-jakarta</artifactId> <!--2-->
+   <artifactId>hibernate-search-mapper-orm-javaee</artifactId> <!--2-->
    <version>{hibernateSearchVersion}</version>
 </dependency>
 <dependency>
@@ -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
@@ -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/...on/src/test/java/org/hibernate/search/documentation/analysis/ElasticsearchAnalysisIT.java b/...on/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/...mentation/src/test/java/org/hibernate/search/documentation/analysis/LuceneAnalysisIT.java b/...mentation/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/...n/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/client/Book.java b/...n/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/...hibernate/search/documentation/backend/elasticsearch/client/ElasticsearchGetClientIT.java b/...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/...earch/documentation/backend/elasticsearch/client/ElasticsearchHttpClientConfigurerIT.java b/...earch/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/...test/java/org/hibernate/search/documentation/backend/elasticsearch/indexmanager/Book.java b/...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/.../search/documentation/backend/elasticsearch/indexmanager/ElasticsearchIndexManagerIT.java b/.../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/...n/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/layout/Book.java b/...n/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/...earch/documentation/backend/elasticsearch/layout/ElasticsearchCustomLayoutStrategyIT.java b/...earch/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/...search/documentation/backend/elasticsearch/mapping/ElasticsearchCustomIndexMappingIT.java b/...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/...earch/documentation/backend/elasticsearch/setting/ElasticsearchCustomIndexSettingsIT.java b/...earch/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/...org/hibernate/search/documentation/backend/elasticsearch/type/asnative/CompanyServer.java b/...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/...e/search/documentation/backend/elasticsearch/type/asnative/ElasticsearchNativeTypeIT.java b/...e/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/...tation/src/test/java/org/hibernate/search/documentation/backend/lucene/analyzer/Book.java b/...tation/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/.../java/org/hibernate/search/documentation/backend/lucene/analyzer/LuceneGetAnalyzerIT.java b/.../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/...on/src/test/java/org/hibernate/search/documentation/backend/lucene/indexmanager/Book.java b/...on/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/.../org/hibernate/search/documentation/backend/lucene/indexmanager/LuceneGetIndexSizeIT.java b/.../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/...g/hibernate/search/documentation/backend/lucene/lowlevel/LuceneLowLevelIndexReaderIT.java b/...g/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/...a/org/hibernate/search/documentation/backend/lucene/type/asnative/LuceneNativeTypeIT.java b/...a/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;