Updated Branches: refs/heads/master 6733db889 -> 8df991785
[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/8df99178 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8df99178 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8df99178 Branch: refs/heads/master Commit: 8df9917855c8226a80bd96311df1533957321f19 Parents: 6733db8 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Feb 2 13:55:16 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Feb 2 13:55:16 2014 +0100 ---------------------------------------------------------------------- .../enterprise/src/main/feature/feature.xml | 19 ++++++++++++++++++- .../itests/features/EnterpriseFeaturesTest.java | 5 +++++ pom.xml | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/8df99178/assemblies/features/enterprise/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml index 2e5ad6e..b507505 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -85,6 +85,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 3.x JPA persistence engine support" version="${hibernate3.version}" resolver="(obr)"> <details>Enable Hibernate 3.x as persistence engine.</details> <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix.specs.version}</bundle> @@ -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="${project.version}" resolver="(obr)"> <details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}, including additional service, commands, and MBean.</details> <bundle start-level="30">mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/8df99178/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java index c3265eb..5a84fe8 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java @@ -45,6 +45,11 @@ public class EnterpriseFeaturesTest extends KarafTestSupport { } @Test + public void installHibernateEnversFeature() throws Exception { + installAssertAndUninstallFeature("hibernate-envers"); + } + + @Test public void installJndiFeature() throws Exception { installAssertAndUninstallFeature("jndi"); } http://git-wip-us.apache.org/repos/asf/karaf/blob/8df99178/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 56e35b1..2b137a2 100644 --- a/pom.xml +++ b/pom.xml @@ -209,7 +209,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> <jansi.version>1.11</jansi.version> <javassist.version>3.9.0.GA</javassist.version> <jline.version>2.11</jline.version>
