Return-Path: 
 <commits-return-14686-apmail-karaf-commits-archive=karaf.apache.org@karaf.apache.org>
X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org
Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A1D2710405
	for <apmail-karaf-commits-archive@minotaur.apache.org>;
 Thu,  9 Jan 2014 14:08:08 +0000 (UTC)
Received: (qmail 37498 invoked by uid 500); 9 Jan 2014 14:08:08 -0000
Delivered-To: apmail-karaf-commits-archive@karaf.apache.org
Received: (qmail 37436 invoked by uid 500); 9 Jan 2014 14:08:01 -0000
Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@karaf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@karaf.apache.org>
List-Post: <mailto:commits@karaf.apache.org>
List-Id: <commits.karaf.apache.org>
Reply-To: dev@karaf.apache.org
Delivered-To: mailing list commits@karaf.apache.org
Received: (qmail 37419 invoked by uid 99); 9 Jan 2014 14:07:58 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jan 2014 14:07:58 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 2B0418B35D7; Thu,  9 Jan 2014 14:07:58 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: jbonofre@apache.org
To: commits@karaf.apache.org
Message-Id: <5fc17353ec2d413e9df459723b3b0487@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: [KARAF-2642] Add openjpa enterprise feature
Date: Thu,  9 Jan 2014 14:07:58 +0000 (UTC)

Updated Branches:
  refs/heads/karaf-2.x 77531de68 -> 52564fa8d


[KARAF-2642] Add openjpa enterprise feature


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

Branch: refs/heads/karaf-2.x
Commit: 52564fa8d6614eed68fc3daaefe44d4b897f3458
Parents: 77531de
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Thu Jan 9 15:07:33 2014 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Thu Jan 9 15:07:33 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/52564fa8/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 a9e3ace..4d49609 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -47,6 +47,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/52564fa8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ed9bb4b..01c3a22 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.8</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>8.1.10.v20130312</jetty.version>
@@ -175,6 +177,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.3.0</openjpa.version>
         <osgi.version>4.3.1</osgi.version>
         <org.json.version>20131018</org.json.version>
         <pax.base.version>1.4.0</pax.base.version>