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 2015/07/07 16:12:52 UTC
[16/50] karaf git commit: [KARAF-3799] Add eclipselink feature
[KARAF-3799] Add eclipselink feature
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/25070e75
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/25070e75
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/25070e75
Branch: refs/heads/master
Commit: 25070e75552417b7ed9890bfcc247f876f31a529
Parents: 3511e30
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Jun 19 17:07:42 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Jun 19 17:07:42 2015 +0200
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 21 ++++++++++++++++----
pom.xml | 3 ++-
2 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/25070e75/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 1990304..658d5b7 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -102,7 +102,7 @@
<feature name="persistence-api" description="Persistence API" version="2.1.0">
<details>Persistence API</details>
- <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>
+ <bundle start-level="30">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
</feature>
<feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.container.context.version}">
@@ -143,7 +143,7 @@
<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: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.commons-dbcp/${commons-dbcp.version}</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>
@@ -162,7 +162,7 @@
<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: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.commons-dbcp/${commons-dbcp.version}</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>
@@ -176,7 +176,7 @@
<feature version="[2.0.0,2.1.0)">persistence-api</feature>
<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/${commons-dbcp.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
<bundle dependency="true">mvn:org.objectweb.asm/com.springsource.org.objectweb.asm/${asm.springsource.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
@@ -247,6 +247,19 @@
<bundle>mvn:org.hibernate/hibernate-validator/${hibernate.validator.version}</bundle>
</feature>
+ <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>
+ <feature version="[1.1,2)">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>
+ <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.core/${eclipselink.version}</bundle>
+ <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.asm/${eclipselink.version}</bundle>
+ <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/${eclipselink.version}</bundle>
+ <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.jpa.jpql/${eclipselink.version}</bundle>
+ <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.eclipselink.adapter/${aries.jpa.version}</bundle>
+ </feature>
+
<feature name="jndi" description="OSGi Service Registry JNDI access" version="${project.version}">
<details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}, including additional service, commands, and MBean.</details>
<feature>aries-proxy</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/25070e75/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c2da7a7..e0b4d1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,13 +135,14 @@
<commons-codec.version>1.10</commons-codec.version>
<commons-compress.version>1.9</commons-compress.version>
<commons-collections.version>3.2.1</commons-collections.version>
- <commons-dbcp.version>1.4</commons-dbcp.version>
+ <commons-dbcp.version>1.4_3</commons-dbcp.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-pool.version>1.6</commons-pool.version>
<commons-io.version>2.4</commons-io.version>
<dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
+ <eclipselink.version>2.6.1-RC1</eclipselink.version>
<jasypt.bundle.version>1.9.2_1</jasypt.bundle.version>
<jolokia.version>1.3.0</jolokia.version>
<serp.bundle.version>1.14.1_1</serp.bundle.version>