karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject karaf git commit: [KARAF-4197] Upgrade to blueprint.core-1.5.0, jpa-2.3.0, transaction.blueprint-2.1.0
Date Thu, 07 Jan 2016 09:34:04 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 86822b1d4 -> a0060aa59


[KARAF-4197] Upgrade to blueprint.core-1.5.0, jpa-2.3.0, transaction.blueprint-2.1.0


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

Branch: refs/heads/master
Commit: a0060aa597d79782597a81ef8ee1016c37f96c0e
Parents: 86822b1
Author: Christian Schneider <chris@die-schneider.net>
Authored: Tue Dec 15 11:19:47 2015 +0100
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Thu Jan 7 10:33:15 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/a0060aa5/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 6977eb0..53ee9e5 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -94,6 +94,7 @@
         <feature version="[1.1,2)">transaction-api</feature>
         <feature version="[2.0.0,2.2.0)">persistence-api</feature>
         <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
+	<bundle dependency="true">mvn:org.osgi/org.osgi.service.jdbc/${org.osgi.service.jdbc.version}</bundle>
         <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
         <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
         <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.support/${aries.jpa.version}</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/a0060aa5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c137782..e35d650 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
         <aries.jmx.blueprint.api.version>1.1.5</aries.jmx.blueprint.api.version>
         <aries.jmx.blueprint.core.version>1.1.5</aries.jmx.blueprint.core.version>
         <aries.jmx.whiteboard.version>1.1.5</aries.jmx.whiteboard.version>
-        <aries.jpa.version>2.2.0</aries.jpa.version>
+        <aries.jpa.version>2.3.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.3</aries.jpa.container.version>


Mime
View raw message