You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/01/10 06:41:25 UTC

git commit: [KARAF-2642] Add openjpa 2.2.2 enterprise feature

Updated Branches:
  refs/heads/karaf-2.3.x 8cb51bfe4 -> d3b0506ce


[KARAF-2642] Add openjpa 2.2.2 enterprise feature


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

Branch: refs/heads/karaf-2.3.x
Commit: d3b0506ce11001c57495f4712e9f613e66ef1a1d
Parents: 8cb51bf
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jan 10 06:40:55 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jan 10 06:40:55 2014 +0100

----------------------------------------------------------------------
 .../features/enterprise/src/main/resources/features.xml | 12 ++++++++++++
 pom.xml                                                 |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/d3b0506c/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 b5ee3e8..a5fd625 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -45,6 +45,18 @@
         <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.container.context.version}</bundle>
     </feature>
 
+    <feature name="openjpa" description="Apache OpenJPA persistent engine support" version="${openjpa.version}" resolver="(obr)">
+        <details>Enable Apache OpenJPA as persistence engine.</details>
+        <feature>jpa</feature>
+        <feature>http</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>
+        <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
+        <bundle dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
+        <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+        <bundle>mvn:org.apache.openjpa/openjpa/${openjpa.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.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.api.version}</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/d3b0506c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eeb6033..db62d4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
     </mailingLists>
 
     <prerequisites>
-        <maven>2.2.1</maven>
+        <maven>3.0.4</maven>
     </prerequisites>
 
     <properties>
@@ -110,9 +110,11 @@
         <commons-codec.version>1.7</commons-codec.version>
         <commons-collections.version>3.2.1</commons-collections.version>
         <commons-compress.version>1.6</commons-compress.version>
+        <commons-dbcp.version>1.4</commons-dbcp.version>
         <commons-fileupload.version>1.2.2</commons-fileupload.version>
         <commons-io.version>2.4</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
+        <commons-pool.version>1.6</commons-pool.version>
         <injection.bundle.version>1.0</injection.bundle.version>
         <jasypt.bundle.version>1.9.1_1</jasypt.bundle.version>
         <jetty.version>7.6.8.v20121106</jetty.version>
@@ -172,6 +174,7 @@
         <log4j.version>1.2.17</log4j.version>
         <maven.version>3.0-alpha-2</maven.version>
         <mina.version>2.0.7</mina.version>
+        <openjpa.version>2.2.2</openjpa.version>
         <osgi.version>4.3.1</osgi.version>
         <pax.base.version>1.4.0</pax.base.version>
         <pax.exam.version>2.6.0</pax.exam.version>