This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.4.x by this push:
new 7bb7c02766 Add Hibernate 6 JPA engine feature (#2559)
7bb7c02766 is described below
commit 7bb7c027660519f8c7195b20b1c931f47ab4e8b2
Author: JB Onofré <[email protected]>
AuthorDate: Wed Apr 22 09:45:47 2026 +0200
Add Hibernate 6 JPA engine feature (#2559)
Add hibernate6 and hibernate6-envers features alongside existing Hibernate
5 features.
Key challenges addressed:
- hibernate-core 6.x has no hibernate-osgi module; hibernate-core must be
wrapped using pax-url-wrap with overwrite=MERGE so BND re-processes the
bundle and our Import-Package instruction (making vendor-specific, CDI,
validation, and JAXB imports optional) actually takes effect
- jakarta.transaction-api 2.0.1 has mandatory CDI imports; wrapped to make
jakarta.enterprise.* and jakarta.interceptor optional
- hibernate-commons-annotations 7.0.3.Final ships with a corrupt
Export-Package manifest value; wrapped with overwrite=FULL to generate
a clean OSGi bundle
Bundles added: hibernate-core 6.6.18.Final, hibernate-envers 6.6.18.Final,
hibernate-commons-annotations 7.0.3.Final, jakarta.transaction-api 2.0.1,
jakarta.persistence-api 3.1.0, byte-buddy 1.17.5, jandex 3.2.7,
antlr4-runtime 4.13.2, stax2-api 4.2.2, jackson-dataformat-xml.
---
assemblies/features/enterprise/pom.xml | 47 ++++++++++++++++++++++
.../enterprise/src/main/feature/feature.xml | 44 ++++++++++++++++++++
pom.xml | 1 +
3 files changed, 92 insertions(+)
diff --git a/assemblies/features/enterprise/pom.xml
b/assemblies/features/enterprise/pom.xml
index de384c6e99..8f1b8757cd 100644
--- a/assemblies/features/enterprise/pom.xml
+++ b/assemblies/features/enterprise/pom.xml
@@ -202,6 +202,53 @@
<artifactId>hibernate-osgi</artifactId>
<version>${hibernate.version}</version>
</dependency>
+
+ <!-- hibernate6 deps -->
+ <dependency>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate6.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>7.0.3.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>jandex</artifactId>
+ <version>3.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>1.17.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ <version>4.13.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>4.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>2.1.3</version>
+ </dependency>
</dependencies>
<build>
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml
b/assemblies/features/enterprise/src/main/feature/feature.xml
index dab66ea21e..dc4de17d80 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -193,6 +193,50 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
<bundle>mvn:org.hibernate/hibernate-envers/${hibernate.version}</bundle>
</feature>
+ <feature name="hibernate6" description="Hibernate 6 JPA engine support"
version="${hibernate6.version}">
+ <!-- wrap required: hibernate-core 6.x incorrectly marks
vendor-specific (oracle, ibm, postgresql,
+ checkerframework, jonas) and CDI/EL/validation/JAXB imports as
mandatory OSGi imports -->
+ <feature prerequisite="true">pax-url-wrap</feature>
+ <feature>aries-blueprint</feature>
+ <!-- Core logging and bytecode -->
+ <bundle>mvn:org.jboss.logging/jboss-logging/3.5.3.Final</bundle>
+ <bundle>mvn:net.bytebuddy/byte-buddy/1.17.5</bundle>
+ <!-- Jakarta core APIs (persistence and transactions) -->
+ <bundle>mvn:jakarta.persistence/jakarta.persistence-api/3.1.0</bundle>
+ <!-- jakarta.transaction-api 2.0.1 requires CDI (jakarta.enterprise.*,
jakarta.interceptor)
+ as mandatory imports; wrapped to make those optional since CDI is
not part of this feature -->
+
<bundle>wrap:mvn:jakarta.transaction/jakarta.transaction-api/2.0.1$overwrite=MERGE&Bundle-SymbolicName=jakarta.transaction-api&Bundle-Version=2.0.1&Import-Package=jakarta.enterprise.context;resolution:=optional,jakarta.enterprise.util;resolution:=optional,jakarta.interceptor;resolution:=optional,*</bundle>
+ <!-- Query parsing -->
+ <bundle>mvn:org.antlr/antlr4-runtime/4.13.2</bundle>
+ <!-- hibernate-commons-annotations: runtime dep of hibernate-core; not
a proper OSGi bundle -->
+
<bundle>wrap:mvn:org.hibernate.common/hibernate-commons-annotations/7.0.3.Final$overwrite=FULL&Bundle-SymbolicName=org.hibernate.commons.annotations&Bundle-Version=7.0.3.Final&Export-Package=org.hibernate.annotations.common.*;version=7.0.3.Final</bundle>
+ <!-- Index and classmate -->
+ <bundle>mvn:io.smallrye/jandex/3.2.7</bundle>
+ <bundle>mvn:com.fasterxml/classmate/1.5.1</bundle>
+ <!-- Jackson (required by hibernate-core for JSON type support) -->
+
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
+
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+
<bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version}</bundle>
+ <!-- StAX2 API (required by jackson-dataformat-xml) -->
+ <bundle>mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
+ <!-- Hibernate ORM core: wrapped to convert incorrectly mandatory
imports to optional.
+ Vendor-specific (oracle, ibm, postgresql, checkerframework,
jonas), CDI
+ (jakarta.enterprise.*, jakarta.inject), Bean Validation
(jakarta.validation.*),
+ JAXB (jakarta.xml.bind.*), JSON-B (jakarta.json.bind), and
jakarta.annotation
+ imports are made optional so the feature works without the full
Jakarta EE stack. -->
+
<bundle>wrap:mvn:org.hibernate.orm/hibernate-core/${hibernate6.version}$overwrite=MERGE&Bundle-SymbolicName=org.hibernate.orm.core&Bundle-Version=${hibernate6.version}&Import-Package=com.ibm.websphere.jtaextensions;resolution:=optional,oracle.jdbc;resolution:=optional,oracle.sql;resolution:=optional,org.checkerframework.checker.initialization.qual;resolution:=optional,org.checkerframework.checker.nullness.qual;resolution:=optional,org.checkerframework.dataflow.qual;re
[...]
+ <capability>
+
osgi.service;objectClass=jakarta.persistence.spi.PersistenceProvider;effective:=active;jakarta.persistence.provider=org.hibernate.jpa.HibernatePersistenceProvider
+ </capability>
+ </feature>
+
+ <feature name="hibernate6-envers" version="${hibernate6.version}"
description="Feature for easily adding Envers support to hibernate6">
+ <feature version="${hibernate6.version}">hibernate6</feature>
+ <!-- hibernate-envers requires javax.transaction (legacy) and
jakarta.xml.bind; both wrapped optional -->
+
<bundle>wrap:mvn:org.hibernate.orm/hibernate-envers/${hibernate6.version}$overwrite=MERGE&Bundle-SymbolicName=org.hibernate.orm.envers&Bundle-Version=${hibernate6.version}&Import-Package=javax.transaction;resolution:=optional,jakarta.xml.bind;resolution:=optional,jakarta.xml.bind.annotation;resolution:=optional,jakarta.annotation;resolution:=optional,*</bundle>
+ </feature>
+
<feature name="hibernate-validator"
version="${hibernate.validator.version}">
<bundle>mvn:org.hibernate.validator/hibernate-validator/${hibernate.validator.version}</bundle>
<bundle>mvn:jakarta.validation/jakarta.validation-api/3.0.0</bundle>
diff --git a/pom.xml b/pom.xml
index 0fbe5f93b3..bc2e485d58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,6 +278,7 @@
<narayana.version>5.13.1.Final</narayana.version>
<hibernate.ejb.version>3.4.0.GA</hibernate.ejb.version>
<hibernate.version>5.6.15.Final</hibernate.version>
+ <hibernate6.version>6.6.18.Final</hibernate6.version>
<hibernate.validator.version>7.0.5.Final</hibernate.validator.version>
<httpclient.version>4.5.14</httpclient.version>
<jansi.version>2.4.3</jansi.version>
