You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/12/15 11:20:14 UTC
karaf git commit: [KARAF-4197] Upgrade to blueprint.core-1.5.0,
jpa-2.3.0, transaction.blueprint-2.1.0
Repository: karaf
Updated Branches:
refs/heads/KARAF-4197 [created] 09d65f849
[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/09d65f84
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/09d65f84
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/09d65f84
Branch: refs/heads/KARAF-4197
Commit: 09d65f849244f07fdb702a6171706759cc876c2d
Parents: de2a50c
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Dec 15 11:19:47 2015 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Dec 15 11:19:47 2015 +0100
----------------------------------------------------------------------
assemblies/features/enterprise/src/main/feature/feature.xml | 1 +
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/09d65f84/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/09d65f84/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 43b58f5..83a7e01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,7 +205,7 @@
<aries.blueprint.annotation.version>1.0.1</aries.blueprint.annotation.version>
<aries.blueprint.annotation.api.version>1.0.1</aries.blueprint.annotation.api.version>
<aries.blueprint.api.version>1.0.1</aries.blueprint.api.version>
- <aries.blueprint.core.version>1.4.5</aries.blueprint.core.version>
+ <aries.blueprint.core.version>1.5.0</aries.blueprint.core.version>
<aries.blueprint.core.compatibility.version>1.0.0</aries.blueprint.core.compatibility.version>
<aries.blueprint.cm.version>1.0.7</aries.blueprint.cm.version>
<aries.blueprint.jexl.evaluator.version>1.0.0</aries.blueprint.jexl.evaluator.version>
@@ -215,7 +215,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.2</aries.jpa.container.version>
@@ -230,7 +230,7 @@
<aries.subsystem.core.version>2.0.6</aries.subsystem.core.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.blueprint.version2>2.0.0</aries.transaction.blueprint.version2>
+ <aries.transaction.blueprint.version2>2.1.0</aries.transaction.blueprint.version2>
<aries.transaction.jdbc.version>2.1.1</aries.transaction.jdbc.version>
<aries.util.version>1.1.1</aries.util.version>