Updated Branches: refs/heads/karaf-2.x 638021114 -> 3332ddad3
[KARAF-2746] Add hibernate-envers feature and update to Hibernate 4.3.1.Final Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3332ddad Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3332ddad Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3332ddad Branch: refs/heads/karaf-2.x Commit: 3332ddad3bbe0c9feb197d5b19a69b5729e6b818 Parents: 6380211 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Feb 2 13:58:28 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Feb 2 13:58:28 2014 +0100 ---------------------------------------------------------------------- .../enterprise/src/main/resources/features.xml | 19 ++++++++++++++++++- pom.xml | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/3332ddad/assemblies/features/enterprise/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/enterprise/src/main/resources/features.xml b/assemblies/features/enterprise/src/main/resources/features.xml index d687d76..345eee1 100644 --- a/assemblies/features/enterprise/src/main/resources/features.xml +++ b/assemblies/features/enterprise/src/main/resources/features.xml @@ -103,6 +103,12 @@ <feature>jpa</feature> </feature> + <feature name="hibernate-envers" description="Hibernate Envers 3.x" version="${hibernate3.version}" resolver="(obr)"> + <details>Enable Hibernate Envers 3.x</details> + <feature version="${hibernate3.version}">hibernate</feature> + <bundle start-level="100">mvn:org.hibernate/hibernate-envers/${hibernate3.version}</bundle> + </feature> + <feature name="hibernate" description="Hibernate 4.2.x JPA persistence engine support" version="${hibernate42.version}" resolver="(obr)"> <details>Enable Hibernate 4.2.x as persistence engine.</details> <feature>transaction</feature> @@ -119,11 +125,16 @@ <bundle dependency="true">mvn:org.hibernate.common/hibernate-commons-annotations/4.0.4.Final</bundle> <bundle start-level="100">mvn:org.hibernate/hibernate-core/${hibernate42.version}</bundle> <bundle start-level="100">mvn:org.hibernate/hibernate-entitymanager/${hibernate42.version}</bundle> - <bundle start-level="100">mvn:org.hibernate/hibernate-envers/${hibernate42.version}</bundle> <bundle start-level="100">mvn:org.hibernate/hibernate-osgi/${hibernate42.version}</bundle> <feature>jpa</feature> </feature> + <feature name="hibernate-envers" description="Hibernate Envers 4.2.x" version="${hibernate42.version}" resolver="(obr)"> + <details>Enable Hibernate Envers 4.2.x</details> + <feature version="${hibernate42.version}">hibernate</feature> + <bundle start-level="100">mvn:org.hibernate/hibernate-envers/${hibernate42.version}</bundle> + </feature> + <feature name="hibernate" description="Hibernate 4.3.x JPA persistence engine support" version="${hibernate43.version}" resolver="(obr)"> <details>Enable Hibernate 4.3.x as persistence engine.</details> <feature>transaction</feature> @@ -145,6 +156,12 @@ <feature>jpa</feature> </feature> + <feature name="hibernate-envers" description="Hibernate Envers 4.3.x" version="${hibernate43.version}" resolver="(obr)"> + <details>Enable Hibernate Envers 4.3.x</details> + <feature version="${hibernate43.version}">hibernate</feature> + <bundle start-level="100">mvn:org.hibernate/hibernate-envers/${hibernate43.version}</bundle> + </feature> + <feature name="jndi" description="OSGi Service Registry JNDI access" version="${aries.jndi.version}" resolver="(obr)"> <details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}</details> <bundle start-level="30">mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/3332ddad/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ee995fd..83285e8 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ <hibernate.ejb.version>3.4.0.GA</hibernate.ejb.version> <hibernate3.version>3.3.2.GA</hibernate3.version> <hibernate42.version>4.2.7.Final</hibernate42.version> - <hibernate43.version>4.3.0.Final</hibernate43.version> + <hibernate43.version>4.3.1.Final</hibernate43.version> <aries.application.version>1.0.0</aries.application.version> <aries.application.api.version>1.0.0</aries.application.api.version>
