Return-Path: 
 <commits-return-25287-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 2B04118811
	for <apmail-karaf-commits-archive@minotaur.apache.org>;
 Mon, 10 Aug 2015 13:20:12 +0000 (UTC)
Received: (qmail 2147 invoked by uid 500); 10 Aug 2015 13:20:12 -0000
Delivered-To: apmail-karaf-commits-archive@karaf.apache.org
Received: (qmail 2122 invoked by uid 500); 10 Aug 2015 13:20:12 -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 2112 invoked by uid 99); 10 Aug 2015 13:20:12 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Aug 2015 13:20:12 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id B13A1E0501; Mon, 10 Aug 2015 13:20:11 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: cschneider@apache.org
To: commits@karaf.apache.org
Date: Mon, 10 Aug 2015 13:20:11 -0000
Message-Id: <9981effe3dfc4b0baf1d2d00be132188@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] karaf git commit: [KARAF-3919] Upgrade to JPA 2.1.0 and
 transaction manager 1.3.0

Repository: karaf
Updated Branches:
  refs/heads/master 08c9593db -> 23847bc53


[KARAF-3919] Upgrade to JPA 2.1.0 and transaction manager 1.3.0


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

Branch: refs/heads/master
Commit: f36f47ceecea1673c8e552373bfda28fa04c8384
Parents: 08c9593
Author: Christian Schneider <chris@die-schneider.net>
Authored: Mon Aug 10 14:13:33 2015 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Mon Aug 10 14:13:33 2015 +0200

----------------------------------------------------------------------
 assemblies/features/enterprise/src/main/feature/feature.xml | 8 ++++----
 pom.xml                                                     | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/f36f47ce/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 7c09a0b..ef172d4 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -73,8 +73,8 @@
         </conditional>
     </feature>
 
-    <feature name="transaction" description="OSGi Transaction Manager" version="1.1.1">
-        <details>JTA implementation provided by Apache Aries Transaction 1.1.1</details>
+    <feature name="transaction" description="OSGi Transaction Manager" version="${aries.transaction.manager.version}">
+        <details>JTA implementation provided by Apache Aries Transaction</details>
         <config name="org.apache.aries.transaction">
             aries.transaction.recoverable = true
             aries.transaction.timeout = 600
@@ -85,7 +85,7 @@
         </config>
         <feature version="[1.1,2)">transaction-api</feature>
         <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.1</bundle>
+        <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.manager.version}</bundle>
         <conditional>
             <condition>aries-blueprint</condition>
             <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle>
@@ -135,7 +135,7 @@
         <details>JPA implementation provided by Apache Aries JPA 2.x. NB: this feature doesn't provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details>
         <feature version="[1.1,2)">transaction</feature>
         <feature version="[2.0.0,2.2.0)">persistence-api</feature>
-        <bundle dependency="true" start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>
+        <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.support/${aries.jpa.version}</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/f36f47ce/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45f5f98..640e3cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,7 @@
         <felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
         <felix.configadmin.version>1.8.4</felix.configadmin.version>
         <felix.connect.version>0.1.0</felix.connect.version>
+        <felix.coordinator.version>1.0.0</felix.coordinator.version>
         <felix.fileinstall.version>3.5.0</felix.fileinstall.version>
         <felix.framework.version>5.0.1</felix.framework.version>
         <felix.framework.security.version>2.4.0</felix.framework.security.version>
@@ -196,7 +197,7 @@
         <aries.jmx.blueprint.api.version>1.1.0</aries.jmx.blueprint.api.version>
         <aries.jmx.blueprint.core.version>1.1.0</aries.jmx.blueprint.core.version>
         <aries.jmx.whiteboard.version>1.0.0</aries.jmx.whiteboard.version>
-        <aries.jpa.version>2.0.0</aries.jpa.version>
+        <aries.jpa.version>2.1.0</aries.jpa.version>
         <aries.jpa.blueprint.aries.version>1.0.4</aries.jpa.blueprint.aries.version>
         <aries.jpa.api.version>1.0.2</aries.jpa.api.version>
         <aries.jpa.container.version>1.0.2</aries.jpa.container.version>
@@ -209,8 +210,8 @@
         <aries.proxy.api.version>1.0.1</aries.proxy.api.version>
         <aries.subsystem.api.version>1.1.0</aries.subsystem.api.version>
         <aries.subsystem.core.version>1.2.0</aries.subsystem.core.version>
-        <aries.transaction.manager.version>1.3.0-SNAPSHOT</aries.transaction.manager.version>
-        <aries.transaction.blueprint.version>1.0.2</aries.transaction.blueprint.version>
+        <aries.transaction.manager.version>1.3.0</aries.transaction.manager.version>
+        <aries.transaction.blueprint.version>1.1.1</aries.transaction.blueprint.version>
         <aries.transaction.jdbc.version>2.1.1</aries.transaction.jdbc.version>
         <aries.util.version>1.1.0</aries.util.version>