Skip to content

Commit

Permalink
TODOTICKET Remove support for Java EE
Browse files Browse the repository at this point in the history
  • Loading branch information
yrodiere committed Oct 6, 2022
1 parent c990695 commit 88cac21
Show file tree
Hide file tree
Showing 28 changed files with 4 additions and 2,518 deletions.
1 change: 0 additions & 1 deletion documentation/pom.xml
Expand Up @@ -317,7 +317,6 @@
<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>
<jakartaUrl>https://jakarta.ee/</jakartaUrl>
Expand Down
Expand Up @@ -17,9 +17,6 @@
|Jakarta Persistence (for the ORM mapper)
|{jakartaPersistenceVersion}
|
|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}
|
Expand Down
48 changes: 2 additions & 46 deletions documentation/src/main/asciidoc/reference/integrations.asciidoc
Expand Up @@ -10,53 +10,9 @@ Hibernate Search targets link:{jakartaUrl}[Jakarta EE] by default.
[[other-integrations-javaee]]
== Java 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 `-javaee` to some artifact identifiers.

For example, an application using Hibernate ORM and the Elasticsearch backend
will need to update its dependencies as follows:
Hibernate Search no longer supports link:{javaeeUrl}[Java EE].

[source, XML, subs="+attributes"]
----
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core-javaee</artifactId> <!--1-->
<version>{hibernateVersion}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-javaee</artifactId> <!--2-->
<version>{hibernateSearchVersion}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-elasticsearch</artifactId> <!--3-->
<version>{hibernateSearchVersion}</version>
</dependency>
----
<1> Replaces `hibernate-core`.
<2> Replaces `hibernate-search-mapper-orm`.
<3> No replacement necessary: this artifact does not rely on Jakarta EE.

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-javaee`
* `hibernate-search-mapper-orm-batch-jsr352-core` => `hibernate-search-mapper-orm-batch-jsr352-core-javaee`
* ...

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`
* `hibernate-search-backend-lucene`
* `hibernate-search-backend-elasticsearch`
* `hibernate-search-backend-elasticsearch-aws`
* ...
Use link:{jakartaUrl}[Jakarta EE] instead.

[[other-integrations-orm6]]
== Hibernate ORM 6
Expand Down
53 changes: 0 additions & 53 deletions javaee/ant-copy-and-transform-sources.xml

This file was deleted.

80 changes: 0 additions & 80 deletions javaee/integrationtest/java/modules/pom.xml

This file was deleted.

187 changes: 0 additions & 187 deletions javaee/integrationtest/mapper/orm-batch-jsr352/pom.xml

This file was deleted.

0 comments on commit 88cac21

Please sign in to comment.