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/01/15 07:39:57 UTC
git commit: [KARAF-2683] Fix OpenJPA features
Updated Branches:
refs/heads/master c329137b5 -> 19c874532
[KARAF-2683] Fix OpenJPA features
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/19c87453
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/19c87453
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/19c87453
Branch: refs/heads/master
Commit: 19c87453249cb3a0410955aed740f63e99500835
Parents: c329137
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jan 15 07:39:26 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 15 07:39:26 2014 +0100
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 36 ++++++++++++++++----
pom.xml | 1 -
2 files changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/19c87453/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 68d42e2..c92cdbc 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -47,16 +47,40 @@
<bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.container.context.version}</bundle>
</feature>
- <feature name="openjpa" description="Apache OpenJPA persistence engine support" version="${openjpa.version}" resolver="(obr)">
+ <feature name="openjpa" description="Apache OpenJPA 2.2.x persistence engine support" version="2.2.2" resolver="(obr)">
<details>Enable Apache OpenJPA as persistence engine.</details>
- <feature>jpa</feature>
- <feature>http</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix.specs.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-jpa_2.0_spec/${geronimo.jpa-spec.version}</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>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.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:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.4_3</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_6</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/3.3_2</bundle>
+ <bundle>mvn:org.apache.openjpa/openjpa/2.2.2</bundle>
+ </feature>
+
+ <feature name="openjpa" description="Apache OpenJPA 2.3.x persistence engine support" version="2.3.0" resolver="(obr)">
+ <details>Enable Apache OpenJPA as persistence engine.</details>
+ <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-jpa_2.0_spec/${geronimo.jpa-spec.version}</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>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
- <bundle>mvn:org.apache.openjpa/openjpa/${openjpa.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/1.4_3</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_6</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.xbean/xbean-asm4-shaded/${xbean.version}</bundle>
+ <bundle>mvn:org.apache.openjpa/openjpa/2.3.0</bundle>
</feature>
<feature name="hibernate" description="Hibernate 3.x JPA persistence engine support" version="${hibernate3.version}" resolver="(obr)">
http://git-wip-us.apache.org/repos/asf/karaf/blob/19c87453/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c9f9fae..415b44b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,6 @@
<log4j.version>1.2.17</log4j.version>
<maven.version>2.0.9</maven.version>
<mina.version>2.0.7</mina.version>
- <openjpa.version>2.2.2</openjpa.version>
<openwebbeans.version>1.2.1</openwebbeans.version>
<osgi.version>5.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>