You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2017/06/11 13:31:43 UTC
karaf git commit: [KARAF-5185] - Karaf enterprise feature shall omit
the jpa feature in favor of the aries jpa feature
Repository: karaf
Updated Branches:
refs/heads/master a99b55a5d -> 03abcbac5
[KARAF-5185] - Karaf enterprise feature shall omit the jpa feature in
favor of the aries jpa feature
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/03abcbac
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/03abcbac
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/03abcbac
Branch: refs/heads/master
Commit: 03abcbac56c39f15eb78f6be57a483d6e9700b11
Parents: a99b55a
Author: anierbeck <bc...@googlemail.com>
Authored: Sun Jun 11 15:31:34 2017 +0200
Committer: anierbeck <bc...@googlemail.com>
Committed: Sun Jun 11 15:31:34 2017 +0200
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/03abcbac/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 4fb3cee..6b6fa04 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -25,6 +25,7 @@
<repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository>
<repository>mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax.jdbc.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
+ <repository>mvn:org.apache.aries.jpa/jpa-features/${aries.jpa.version}/xml/features</repository>
<feature name="transaction-api" version="1.2.0">
<bundle dependency="true">mvn:javax.interceptor/javax.interceptor-api/1.2</bundle>
@@ -87,24 +88,6 @@
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle>
</feature>
- <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 dependency="true">openjpa</feature>
- <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</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.felix/org.apache.felix.coordinator/${felix.coordinator.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>
- <conditional>
- <condition>aries-blueprint</condition>
- <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint/${aries.jpa.version}</bundle>
- </conditional>
- </feature>
-
<feature name="openjpa" description="Apache OpenJPA 2.4.x persistence engine support" version="2.4.1">
<details>Enable Apache OpenJPA as persistence engine.</details>
<feature>jndi</feature>