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/11/05 07:40:17 UTC
git commit: [KARAF-3307] Upgrade to Aries JPA API 1.0.2,
Aries JPA Container 1.0.2, Aries JPA Blueprint Aries 1.0.4,
and Aries JPA Container Context 1.0.4
Repository: karaf
Updated Branches:
refs/heads/master 6c4c948e2 -> 170905411
[KARAF-3307] Upgrade to Aries JPA API 1.0.2, Aries JPA Container 1.0.2, Aries JPA Blueprint Aries 1.0.4, and Aries JPA Container Context 1.0.4
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/17090541
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/17090541
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/17090541
Branch: refs/heads/master
Commit: 170905411d1544aebc1fc8d12c433f2085ce3724
Parents: 6c4c948
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Nov 5 07:39:15 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Nov 5 07:39:15 2014 +0100
----------------------------------------------------------------------
.../features/enterprise/src/main/feature/feature.xml | 12 ++++++------
pom.xml | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/17090541/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 396e0ae..5d0364e 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -91,16 +91,16 @@
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle>
</feature>
- <feature name="jpa" description="OSGi Persistence Container 2.0" version="1.0.1">
- <details>JPA 2.0 implementation provided by Apache Aries JPA 1.0.1. NB: this feature doesn"t provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details>
+ <feature name="jpa" description="OSGi Persistence Container 2.0" version="${aries.jpa.version}">
+ <details>JPA 2.0 implementation provided by Apache Aries JPA ${aries.jpa.version}. NB: this feature doesn"t provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/1.0.0</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/1.0.0</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/1.0.1</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.api.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.container.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.container.context.version}</bundle>
<conditional>
<condition>aries-blueprint</condition>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/1.0.1</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.blueprint.aries.version}</bundle>
</conditional>
</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/17090541/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 95907d3..f4b570f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,10 +193,10 @@
<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>1.0.2</aries.jpa.version>
- <aries.jpa.blueprint.aries.version>1.0.2</aries.jpa.blueprint.aries.version>
- <aries.jpa.api.version>1.0.1</aries.jpa.api.version>
- <aries.jpa.container.version>1.0.1</aries.jpa.container.version>
- <aries.jpa.container.context.version>1.0.2</aries.jpa.container.context.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>
+ <aries.jpa.container.context.version>1.0.4</aries.jpa.container.context.version>
<aries.jndi.version>1.0.0</aries.jndi.version>
<aries.jndi.api.version>1.1.0</aries.jndi.api.version>
<aries.proxy.version>1.0.4</aries.proxy.version>