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/24 06:52:21 UTC
git commit: Revert "[KARAF-2725] jpa feature installs the
org.osgi.enterprise bundle"
Updated Branches:
refs/heads/master 56763b3d1 -> 969f4b940
Revert "[KARAF-2725] jpa feature installs the org.osgi.enterprise bundle"
This reverts commit f4b87237961d662e3fd78a15cea7c77e97e14918.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/969f4b94
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/969f4b94
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/969f4b94
Branch: refs/heads/master
Commit: 969f4b9408ffcdd3466678086eab944b1eedd1eb
Parents: 56763b3
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jan 24 06:51:51 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jan 24 06:51:51 2014 +0100
----------------------------------------------------------------------
assemblies/features/enterprise/src/main/feature/feature.xml | 1 -
pom.xml | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/969f4b94/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 715f4fe..2e5ad6e 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -39,7 +39,6 @@
<feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.version}" resolver="(obr)">
<details>JPA 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.osgi/org.osgi.enterprise/${osgi.enterprise.version}</bundle>
<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/${aries.jpa.api.version}</bundle>
http://git-wip-us.apache.org/repos/asf/karaf/blob/969f4b94/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c7ceec5..53faad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,7 +224,6 @@
<openwebbeans.version>1.2.1</openwebbeans.version>
<osgi.version>5.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
- <osgi.enterprise.version>5.0.0</osgi.enterprise.version>
<org.json.version>20131018</org.json.version>
<pax.cdi.version>0.6.0</pax.cdi.version>
<pax.exam.version>3.4.0</pax.exam.version>