karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-2666] Add Hibernate 4 feature
Date Sun, 05 Jan 2014 20:41:37 GMT
Updated Branches:
  refs/heads/master 1b414a03c -> c5ae547d6


[KARAF-2666] Add Hibernate 4 feature


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c5ae547d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c5ae547d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c5ae547d

Branch: refs/heads/master
Commit: c5ae547d69e8896251c03bd5e5968094ce70e941
Parents: 1b414a0
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sun Jan 5 21:40:53 2014 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sun Jan 5 21:40:53 2014 +0100

----------------------------------------------------------------------
 .../enterprise/src/main/feature/feature.xml     | 27 +++++++++++++++++---
 pom.xml                                         |  7 +++--
 2 files changed, 29 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ae547d/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 ae970de..e7fbd2f 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -59,8 +59,8 @@
         <bundle>mvn:org.apache.openjpa/openjpa/${openjpa.version}</bundle>
     </feature>
 
-    <feature name="hibernate" description="Hibernate JPA persistence engine support" version="${hibernate.version}"
resolver="(obr)">
-        <details>Enable Hibernate as persistence engine.</details>
+    <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>
         <feature>jpa</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix.specs.version}</bundle>
         <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
@@ -74,7 +74,28 @@
         <bundle>mvn:org.hibernate/com.springsource.org.hibernate.annotations.common/${hibernate.annotations.common.version}</bundle>
         <bundle>mvn:org.hibernate/com.springsource.org.hibernate.annotations/${hibernate.annotations.version}</bundle>
         <bundle>mvn:org.hibernate/com.springsource.org.hibernate.ejb/${hibernate.ejb.version}</bundle>
-        <bundle>mvn:org.hibernate/com.springsource.org.hibernate/${hibernate.version}</bundle>
+        <bundle>mvn:org.hibernate/com.springsource.org.hibernate/${hibernate3.version}</bundle>
+    </feature>
+
+    <feature name="hibernate" description="Hibernate 4.x JPA persistence engine support"
version="${hibernate4.version}" resolver="(obr)">
+        <details>Enable Hibernate 4.x as persistence engine.</details>
+        <feature>transaction</feature>
+        <feature>jpa</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">mvn:org.jboss.spec.javax.security.jacc/jboss-jacc-api_1.4_spec/1.0.2.Final</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>mvn:org.hibernate/hibernate-core/${hibernate4.version}</bundle>
+        <bundle>mvn:org.hibernate/hibernate-entitymanager/${hibernate4.version}</bundle>
+        <bundle>mvn:org.hibernate/hibernate-envers/${hibernate4.version}</bundle>
+        <bundle>mvn:org.hibernate/hibernate-osgi/${hibernate4.version}</bundle>
     </feature>
 
     <feature name="jndi" description="OSGi Service Registry JNDI access" version="${project.version}"
resolver="(obr)">

http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ae547d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fe4f511..d80d268 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,7 @@
 
     <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>
@@ -136,8 +137,9 @@
         <commons-jexl.version>2.1.1</commons-jexl.version>
         <commons-lang.version>2.6</commons-lang.version>
         <commons-pool.version>1.6</commons-pool.version>
-        <dom4j.bundle.version>1.6.1_2</dom4j.bundle.version>
+        <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
         <jasypt.bundle.version>1.9.1_1</jasypt.bundle.version>
+        <serp.bundle.version>1.14.1_1</serp.bundle.version>
         <servlet.spec.groupId>org.apache.geronimo.specs</servlet.spec.groupId>
         <servlet.spec.artifactId>geronimo-servlet_3.0_spec</servlet.spec.artifactId>
         <servlet.spec.version>1.0</servlet.spec.version>
@@ -209,7 +211,8 @@
         <hibernate.annotations.common.version>3.3.0.ga</hibernate.annotations.common.version>
         <hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version>
         <hibernate.ejb.version>3.4.0.GA</hibernate.ejb.version>
-        <hibernate.version>3.3.2.GA</hibernate.version>
+        <hibernate3.version>3.3.2.GA</hibernate3.version>
+        <hibernate4.version>4.2.7.Final</hibernate4.version>
         <jansi.version>1.11</jansi.version>
         <javassist.version>3.9.0.GA</javassist.version>
         <jline.version>2.11</jline.version>


Mime
View raw message