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 2016/07/29 12:31:02 UTC
karaf git commit: [KARAF-4615] Make sure providers requiring jpa 2.0
and 2.1 can both work
Repository: karaf
Updated Branches:
refs/heads/master 5bbaf7181 -> 7c44db45f
[KARAF-4615] Make sure providers requiring jpa 2.0 and 2.1 can both work
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7c44db45
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7c44db45
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7c44db45
Branch: refs/heads/master
Commit: 7c44db45f4c8d75b2a7fabf9eaec3e37b84bfec1
Parents: 5bbaf71
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Jul 29 14:30:55 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Jul 29 14:30:55 2016 +0200
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 31 +++++++-------------
pom.xml | 1 +
2 files changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/7c44db45/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 beef8a8..a4a840d 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -94,20 +94,10 @@
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle>
</feature>
- <feature name="persistence-api" description="Persistence API" version="2.0.0">
- <details>Persistence API</details>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
- </feature>
-
- <feature name="persistence-api" description="Persistence API" version="2.1.0">
- <details>Persistence API</details>
- <bundle>mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
- </feature>
-
<feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.container.context.version}">
<details>JPA implementation provided by Apache Aries JPA 1.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-api</feature>
- <feature version="[2.0.0,2.2.0)">persistence-api</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<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.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>
@@ -121,9 +111,10 @@
<feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.version}">
<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-api</feature>
- <feature version="[2.0.0,2.2.0)">persistence-api</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<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 dependency="true">mvn:org.osgi/org.osgi.service.jpa/${org.osgi.service.jpa.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>
@@ -137,7 +128,7 @@
<details>Enable Apache OpenJPA as persistence engine.</details>
<feature>jndi</feature>
<feature version="[1.1,1.2)">transaction-api</feature>
- <feature version="[2.0.0,2.1.0)">persistence-api</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
@@ -155,7 +146,7 @@
<feature name="openjpa" description="Apache OpenJPA 2.3.x persistence engine support" version="2.3.0">
<details>Enable Apache OpenJPA as persistence engine.</details>
<feature version="[1.1,1.2)">transaction-api</feature>
- <feature version="[2.0.0,2.1.0)">persistence-api</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
@@ -175,7 +166,7 @@
<details>Enable Apache OpenJPA as persistence engine.</details>
<feature>jndi</feature>
<feature version="[1.2,1.3)">transaction-api</feature>
- <feature version="[2.0.0,2.1.0)">persistence-api</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
@@ -193,7 +184,7 @@
<feature name="hibernate" description="Hibernate 3.x JPA persistence engine support" version="${hibernate3.version}">
<details>Enable Hibernate 3.x as persistence engine.</details>
<feature>jndi</feature>
- <feature version="[2.0.0,2.1.0)">persistence-api</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.version}</bundle>
@@ -210,7 +201,7 @@
<feature name="hibernate" description="Hibernate 4.2.x JPA persistence engine support" version="${hibernate42.version}">
<details>Enable Hibernate 4.2.x as persistence engine.</details>
- <feature version="[2.0.0,2.1.0)">persistence-api</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<feature>http</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
@@ -236,7 +227,7 @@
<feature name="hibernate" description="Hibernate 4.3.x JPA persistence engine support" version="${hibernate43.version}">
<details>Enable Hibernate 4.3.x as persistence engine.</details>
<feature>http</feature>
- <feature version="[2.1.0,2.2.0)">persistence-api</feature>
+ <bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
@@ -269,7 +260,7 @@
<feature name="eclipselink" description="Eclipselink JPA persistence engine support" version="${eclipselink.version}">
<details>Eclipselink persistence engine.</details>
- <feature version="[2.1.0,2.2.0)">persistence-api</feature>
+ <bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
<feature version="[2,3)">transaction</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.version}</bundle>
<bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.jpa/${eclipselink.version}</bundle>
http://git-wip-us.apache.org/repos/asf/karaf/blob/7c44db45/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3dd18d4..3eab8ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,6 +255,7 @@
<log4j.version>1.2.17</log4j.version>
<maven.version>2.0.9</maven.version>
<org.osgi.service.jdbc.version>1.0.0</org.osgi.service.jdbc.version>
+ <org.osgi.service.jpa.version>1.0.0</org.osgi.service.jpa.version>
<osgi.version>6.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<org.json.version>20150729</org.json.version>