Repository: karaf Updated Branches: refs/heads/karaf-2.3.x 1b0b1df28 -> d8b977d12
[KARAF-2870] Add hibernate 4.x and hibernate-envers 4.x features Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d8b977d1 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d8b977d1 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d8b977d1 Branch: refs/heads/karaf-2.3.x Commit: d8b977d12ff7f5f368a239c1e13ba2dc57286c2d Parents: 1b0b1df Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Apr 7 13:43:56 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Apr 7 13:43:56 2014 +0200 ---------------------------------------------------------------------- .../enterprise/src/main/resources/features.xml | 53 +++++++++++++++++++- pom.xml | 6 ++- 2 files changed, 57 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d8b977d1/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 8f2443e..263419b 100644 --- a/assemblies/features/enterprise/src/main/resources/features.xml +++ b/assemblies/features/enterprise/src/main/resources/features.xml @@ -94,7 +94,7 @@ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle> <bundle dependency="true">mvn:org.objectweb.asm/com.springsource.org.objectweb.asm/${asm.springsource.version}</bundle> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle> + <bundle dependency="true">mvn:net.sourceforge.cglib/com.springsource.net.sf.cglib/${cglib2.version}</bundle> <bundle dependency="true">mvn:org.jboss.javassist/com.springsource.javassist/${javassist.version}</bundle> <bundle start-level="100">mvn:org.hibernate/com.springsource.org.hibernate.annotations.common/${hibernate.annotations.common.version}</bundle> <bundle start-level="100">mvn:org.hibernate/com.springsource.org.hibernate.annotations/${hibernate.annotations.version}</bundle> @@ -103,6 +103,57 @@ <feature>jpa</feature> </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> + <feature>http</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle> + <bundle dependency="true">mvn:com.fasterxml/classmate/0.9.0</bundle> + <bundle dependency="true">mvn:org.javassist/javassist/3.18.1-GA</bundle> + <bundle dependency="true">wrap:mvn:org.jboss/jandex/1.1.0.Final</bundle> + <bundle dependency="true">mvn:org.jboss.logging/jboss-logging/3.1.4.GA</bundle> + <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-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> + <feature>http</feature> + <bundle dependency="true" start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle> + <bundle dependency="true">mvn:com.fasterxml/classmate/0.9.0</bundle> + <bundle dependency="true">mvn:org.javassist/javassist/3.18.1-GA</bundle> + <bundle dependency="true">wrap:mvn:org.jboss/jandex/1.1.0.Final</bundle> + <bundle dependency="true">mvn:org.jboss.logging/jboss-logging/3.1.4.GA</bundle> + <bundle dependency="true">mvn:org.hibernate.common/hibernate-commons-annotations/4.0.4.Final</bundle> + <bundle start-level="100">mvn:org.hibernate/hibernate-core/${hibernate43.version}</bundle> + <bundle start-level="100">mvn:org.hibernate/hibernate-entitymanager/${hibernate43.version}</bundle> + <bundle start-level="100">mvn:org.hibernate/hibernate-osgi/${hibernate43.version}</bundle> + <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="hibernate-validator" description="Hibernate Validator support" version="${hibernate.validator.version}" resolver="(obr)"> <bundle dependency="true">mvn:javax.validation/validation-api/1.1.0.Final</bundle> <bundle dependency="true">mvn:com.fasterxml/classmate/1.0.0</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/d8b977d1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 690379b..2a88ef6 100644 --- a/pom.xml +++ b/pom.xml @@ -107,12 +107,14 @@ <properties> <aopalliance.bundle.version>1.0_6</aopalliance.bundle.version> + <ant.bundle.version>1.8.2_2</ant.bundle.version> <antlr.bundle.version>2.7.7_5</antlr.bundle.version> <asm.version>4.1</asm.version> <asm.springsource.version>1.5.3</asm.springsource.version> <aspectj.bundle.version>1.7.4_1</aspectj.bundle.version> <bndlib.version>2.2.0</bndlib.version> <cglib.bundle.version>2.2.2_1</cglib.bundle.version> + <cglib2.version>2.2.0</cglib2.version> <commons-beanutils.version>1.9.1</commons-beanutils.version> <commons-codec.version>1.9</commons-codec.version> <commons-collections.version>3.2.1</commons-collections.version> @@ -125,7 +127,7 @@ <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version> <injection.bundle.version>1.0</injection.bundle.version> <jasypt.bundle.version>1.9.1_1</jasypt.bundle.version> - <javassist.version>3.9.0.GA</javassist.version> + <javassist.version>3.18.1-GA</javassist.version> <jetty.version>7.6.9.v20130131</jetty.version> <junit.version>4.10</junit.version> <junit.bundle.version>4.10_1</junit.bundle.version> @@ -158,6 +160,8 @@ <hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version> <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.1.Final</hibernate43.version> <hibernate.validator.version>5.0.3.Final</hibernate.validator.version> <aries.application.version>1.0.0</aries.application.version>
